diff --git a/fmp/fmp.js b/fmp/fmp.js
index 6b82d03..c500120 100644
--- a/fmp/fmp.js
+++ b/fmp/fmp.js
@@ -326,9 +326,8 @@ function installUnpackedPackage(manifest_filename) {
 }
 
 function filterPackages(registry, options) {
-	if(!registry) { return []; }
-	
-	var packages =  registry.packages.filter(function(package) {
+	if(!registry || !registry.packages) { return []; }
+	var packages = registry.packages.filter(function(package) {
 		for(var key in options) {
 			if(options.hasOwnProperty(key)) {
 				try {
diff --git a/static/index.html b/static/index.html
index 7275442..1330a2e 100644
--- a/static/index.html
+++ b/static/index.html
@@ -87,8 +87,11 @@ <h1>&nbsp;<span class="fa fa-info-circle"></span> System Information</h1>
     <div class="content-pane" id="view-updates">
       <h1><span class="fa fa-download"></span> Software Update</h1>
       <p>
+        <div id="check-for-updates-controls">
         <p id="message-noupdates">There are no software updates available. </p>
         <button id="btn-check-for-updates" class="btn"><i class="fa fa-cloud-download fa-lg" id="check-button-icon"></i> <span id="check-button-text"> Check for Updates</span></button>
+        </div>
+
         <div id="message-updates" class="hide">
           <p>A software update is available!</p>
           <p><pre id="message-changelog"></pre></p>
diff --git a/static/js/main.js b/static/js/main.js
index c9324c4..0e384a3 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -325,8 +325,10 @@ $(document).ready(function() {
       $('#update-button-text').text('Update ' + update.product + ' to ' + update.version);
       $('#message-updates').removeClass('hide');
       $('#message-noupdates').addClass('hide');   
-      $('.update-indicator').addClass('updates-available')   
+      $('.update-indicator').addClass('updates-available')  
+      $('#check-for-updates-controls').addClass('hide'); 
     } else {
+      $('#check-for-updates-controls').removeClass('hide'); 
       $('#message-updates').addClass('hide');
       $('#message-noupdates').removeClass('hide');      
       $('.update-indicator').removeClass('updates-available')