diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index d6b6c34bf10..270ae80f704 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -229,7 +229,15 @@ def copy_ember_cli_assets
   assets = {}
   files = {}
 
-  system("yarn --cwd #{ember_dir} run ember build -prod")
+  unless system("yarn --cwd #{ember_dir} install")
+    STDERR.puts "Error running yarn install"
+    exit 1
+  end
+
+  unless system("yarn --cwd #{ember_dir} run ember build -prod")
+    STDERR.puts "Error running ember build"
+    exit 1
+  end
 
   # Copy assets and generate manifest data
   Dir["#{ember_cli_assets}**/*"].each do |f|