diff --git a/src/js/client.js b/src/js/client.js
index 9aee21674..5e8204dcb 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1571,8 +1571,14 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         // amend the post install confirm state
         app.pendingPostInstallConfirmation = !!localStorage['confirmPostInstall_' + app.id];
 
-        var tmp = app.manifest.description.match(/\<upstream\>(.*)\<\/upstream\>/i);
-        app.upstreamVersion = (tmp && tmp[1]) ? tmp[1] : '';
+        if (app.manifest.description) { // can be empty for dev apps
+            var tmp = app.manifest.description.match(/\<upstream\>(.*)\<\/upstream\>/i);
+            app.upstreamVersion = (tmp && tmp[1]) ? tmp[1] : '';
+        } else {
+            app.upstreamVersion = '';
+        }
+
+        if (!app.manifest.title) app.manifest.title = 'Untitled';
 
         return app;
     };
diff --git a/src/views/app.html b/src/views/app.html
index 3e4d72185..9949e9b49 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -318,7 +318,7 @@
               <li ng-class="{ 'disabled': !app.manifest.postInstallMessage }"><a href="" ng-click="postInstallMessage.show(false)">First Time Setup</a></li>
               <li ng-class="{ 'disabled': !app.manifest.documentationUrl }"><a ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a></li>
               <li role="separator" class="divider"></li>
-              <li><a ng-href="{{ app.manifest.website }}" target="_blank">Project Website</a></li>
+              <li ng-class="{ 'disabled': !app.manifest.website }"><a ng-href="{{ app.manifest.website }}" target="_blank">Project Website</a></li>
             </ul>
           </div>
         </div>