diff --git a/grunt/config/uglify.js b/grunt/config/uglify.js
index 38ccfa1..15e8590 100644
--- a/grunt/config/uglify.js
+++ b/grunt/config/uglify.js
@@ -8,7 +8,10 @@
 module.exports = function (config) {
   return {
     app: {
-      src: config.static + 'js/{templates,app}.develop.js',
+      src: [
+        config.static + 'js/shaders.develop.js',
+        config.static + 'js/app.develop.js'
+      ],
       dest: config.static + 'js/app.min.js'
     },
     libs: {
diff --git a/static/js/app.js b/static/js/app.js
index c7f5e83..724c747 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -1,4 +1,4 @@
-var shaders = window.App.shaders;
+var shaders = window.App && window.App.shaders;
 window.App = {
   shaders : shaders
 };