Merge remote-tracking branch 'upstream/master'

js/services.js

@@ -90,8 +90,9 @@ angular.module('kibana.services', [])
         alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
         alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
           ". Please ensure that Elasticsearch is reachable from your system." ,'error');
           ". Please ensure that Elasticsearch is reachable from your system." ,'error');
      } else {
      } else {
-        alertSrv.set('Error',"Could not find "+config.elasticsearch+"/"+indices.join(',')+"/_mapping. If you"+
-          " are using a proxy, ensure it is configured correctly",'error');
+        alertSrv.set('Error',"No index found at "+config.elasticsearch+"/" +
+         indices.join(',')+"/_mapping. Please create at least one index."  +
+         "If you're using a proxy ensure it is configured correctly.",'error');
       }
       }
     });
     });