diff --git a/app/assets/javascripts/darkswarm/services/order.js.coffee b/app/assets/javascripts/darkswarm/services/order.js.coffee
index 10c2d5322f..94e8e8d299 100644
--- a/app/assets/javascripts/darkswarm/services/order.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order.js.coffee
@@ -11,10 +11,10 @@ Darkswarm.factory 'Order', ($resource, Product, order)->
       @shipping_methods[@shipping_method_id]
 
     requireShipAddress: ->
-      @shippingMethod().require_ship_address
+      @shippingMethod()?.require_ship_address
 
     shippingPrice: ->
-      @shippingMethod().price
+      @shippingMethod()?.price
     
     paymentMethod: ->
       @payment_methods[@payment_method_id]
diff --git a/app/assets/javascripts/store/all.js b/app/assets/javascripts/store/all.js
index 4da67e3567..59af65daa5 100644
--- a/app/assets/javascripts/store/all.js
+++ b/app/assets/javascripts/store/all.js
@@ -9,7 +9,7 @@
 //= require store/spree_core
 //= require store/spree_auth
 //= require store/spree_promo
-//= require shared/angular
-//= require shared/angular-resource
+//= require angular
+//= require angular-resource
 
 //= require_tree .