Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/product/models/sale-handler.js

@@ -742,7 +742,9 @@ const _formatParams = (channel, data) => {
     return searchApi.get('/search.json', params).then(result => {
         let ret = result.data;
 
-        ret.channel = channel;
+        if (ret) {
+            ret.channel = channel;
+        }
 
         return ret;
     });