diff --git a/controllers/bonfire.js b/controllers/bonfire.js
index b2d72d2e00..a753b55177 100644
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -12,12 +12,11 @@ var _ = require('lodash'),
  */
 
 exports.showAllBonfires = function(req, res) {
+  var completedBonfires = [];
   if(req.user) {
-      var completedBonfires = req.user.completedBonfires.map(function (elem) {
+      completedBonfires = req.user.completedBonfires.map(function (elem) {
           return elem._id;
       });
-  } else {
-      completedBonfires = [];
   }
   var noDuplicateBonfires = R.uniq(completedBonfires);
   var data = {};
diff --git a/controllers/courseware.js b/controllers/courseware.js
index 2fa3465633..87165dc9c3 100644
--- a/controllers/courseware.js
+++ b/controllers/courseware.js
@@ -11,9 +11,12 @@ var _ = require('lodash'),
  */
 
 exports.showAllCoursewares = function(req, res) {
-   var completedCoursewares = req.user.completedCoursewares.map(function(elem) {
-    return elem._id;
-  });
+  var completedList = [];
+  if(req.user) {
+    completedList = req.user.completedList.map(function (elem) {
+      return elem._id;
+    });
+  }
 
   var noDuplicatedCoursewares = R.uniq(completedCoursewares);
   var data = {};
diff --git a/views/partials/bonfires.jade b/views/partials/bonfires.jade
index 3958fd1905..ffb5fec419 100644
--- a/views/partials/bonfires.jade
+++ b/views/partials/bonfires.jade
@@ -3,6 +3,8 @@ h3
     script(src='/js/lib/ramda/ramda.min.js')
     script.
         var getLinkedName = function getLinkedName(name) {
+            // ensure name is a string
+            name = name + '';
             return name.toLowerCase().replace(/\s/g, '-');
         }
         $.ajax({