diff --git a/docs/generate-versions.js b/docs/generate-versions.js
index 0dfbf8ce8d..3de47fd735 100644
--- a/docs/generate-versions.js
+++ b/docs/generate-versions.js
@@ -10,9 +10,14 @@ module.exports = function(config) {
 
   var docsBaseFolder = path.resolve(basePath, outputFolder, 'docs');
 
-  var versions = fs.readdirSync(docsBaseFolder)
-    .filter(semver.valid)
-    .sort(semver.rcompare);
+  var versions;
+  try {
+    versions = fs.readdirSync(docsBaseFolder)
+      .filter(semver.valid)
+      .sort(semver.rcompare);
+  } catch(e) {
+    versions = [];
+  }
 
   !_.contains(versions, currentVersion) && versions.unshift(currentVersion);
   !_.contains(versions, 'nightly') && versions.unshift('nightly');
diff --git a/docs/processors/demos.js b/docs/processors/demos.js
index 0c627b35dd..dc342d61fa 100644
--- a/docs/processors/demos.js
+++ b/docs/processors/demos.js
@@ -14,8 +14,6 @@ module.exports = {
     contentsFolder = config.get('rendering.contentsFolder');
   },
   process: function(docs, config, extraData) {
-    //Disable demos for now
-    if(1) return;
     var demoTags = [
       'javascript',
       'html',