diff --git a/app/components/dashboard/dashboardController.js b/app/components/dashboard/dashboardController.js
index 2b3667304..0368f3ee2 100644
--- a/app/components/dashboard/dashboardController.js
+++ b/app/components/dashboard/dashboardController.js
@@ -50,7 +50,9 @@ function ($scope, $q, Config, Container, Image, Network, Volume, Info) {
 
   function prepareVolumeData(d) {
     var volumes = d.Volumes;
-    $scope.volumeData.total = volumes.length;
+    if (volumes) {
+      $scope.volumeData.total = volumes.length;
+    }
   }
 
   function prepareNetworkData(d) {
diff --git a/gruntFile.js b/gruntFile.js
index 4af600813..86c2f3ebe 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -152,11 +152,11 @@ module.exports = function (grunt) {
                 }
             },
             angular: {
-                src: ['bower_components/angular/angular.js',
+                src: ['bower_components/angular/angular.min.js',
                     'bower_components/angular-sanitize/angular-sanitize.min.js',
                     'bower_components/angular-cookies/angular-cookies.min.js',
                     'bower_components/angular-ui-router/release/angular-ui-router.min.js',
-                    'bower_components/angular-resource/angular-resource.js',
+                    'bower_components/angular-resource/angular-resource.min.js',
                     'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
                     'bower_components/angular-ui-select/dist/select.min.js'],
                 dest: '<%= distdir %>/js/angular.js'