diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py
index 7285e66e..3a090e83 100644
--- a/src/sugar3/activity/bundlebuilder.py
+++ b/src/sugar3/activity/bundlebuilder.py
@@ -178,9 +178,12 @@ class Packager(object):
                          'fall back to filtered list')
             return list_files(self.config.source_dir,
                               IGNORE_DIRS, IGNORE_FILES)
-
-        # pylint: disable=E1103
-        return [path.strip() for path in stdout.strip('\n').split('\n')]
+        if stdout:
+            # pylint: disable=E1103
+            return [path.strip() for path in stdout.strip('\n').split('\n')]
+        else:
+            return list_files(self.config.source_dir,
+                              IGNORE_DIRS, IGNORE_FILES)
 
 
 class XOPackager(Packager):