diff --git a/solr/webapp/web/js/scripts/index.js b/solr/webapp/web/js/scripts/index.js
index d65ff8897b4..91995b598ee 100644
--- a/solr/webapp/web/js/scripts/index.js
+++ b/solr/webapp/web/js/scripts/index.js
@@ -99,7 +99,7 @@ var system_info = function( element, system_data )
 {
   // -- usage
 
-  var load_average = system_data['system']['uptime'].match( /load average: (.+)/ );
+  var load_average = ( system_data['system']['uptime'] || '' ).match( /load average: (.+)/ );
   if( load_average && load_average[1] )
   {
     var hl = $( '#system h2', element );
@@ -239,10 +239,10 @@ sammy.get
             'dir_index' : app.dashboard_values['core']['directory']['index'],
             'jvm_version' : app.dashboard_values['jvm']['name'] + ' (' + app.dashboard_values['jvm']['version'] + ')',
             'processors' : app.dashboard_values['jvm']['processors'],
-            'solr_spec_version' : app.dashboard_values['lucene']['solr-spec-version'],
-            'solr_impl_version' : app.dashboard_values['lucene']['solr-impl-version'],
-            'lucene_spec_version' : app.dashboard_values['lucene']['lucene-spec-version'],
-            'lucene_impl_version' : app.dashboard_values['lucene']['lucene-impl-version']
+            'solr_spec_version' : app.dashboard_values['lucene']['solr-spec-version'] || '-',
+            'solr_impl_version' : app.dashboard_values['lucene']['solr-impl-version'] || '-',
+            'lucene_spec_version' : app.dashboard_values['lucene']['lucene-spec-version'] || '-',
+            'lucene_impl_version' : app.dashboard_values['lucene']['lucene-impl-version'] || '-'
           };
 
           if( app.dashboard_values['core']['directory']['cwd'] )