diff --git a/backend/app/assets/javascripts/spree/backend/shipments.js b/backend/app/assets/javascripts/spree/backend/shipments.js
index db12d266d78..abc6e459488 100644
--- a/backend/app/assets/javascripts/spree/backend/shipments.js
+++ b/backend/app/assets/javascripts/spree/backend/shipments.js
@@ -85,7 +85,12 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
         window.location.reload();
       },
       error: function(response) {
-        window.show_flash('error', response.responseJSON.message);
+        json = response.responseJSON;
+        message = json.error;
+        for (error in json.errors) {
+          message += '<br />' + json.errors[error].join();
+        }
+        window.show_flash('error', message);
       }
     });
   }
diff --git a/backend/spec/features/admin/orders/shipments_spec.rb b/backend/spec/features/admin/orders/shipments_spec.rb
index 3418392b108..3a5e299d3e8 100644
--- a/backend/spec/features/admin/orders/shipments_spec.rb
+++ b/backend/spec/features/admin/orders/shipments_spec.rb
@@ -58,6 +58,34 @@ def ship_shipment
     end
   end
 
+  context "destroying a shipment", js: true do
+    before do
+      visit spree.admin_path
+      click_link "Orders"
+      within_row(1) do
+        click_link "R100"
+      end
+    end
+
+    context "when the line item cannot be found" do
+      it "shows the proper error message" do
+        expect(page).to have_selector '.delete-item'
+        order.shipments.first.line_items.each(&:destroy)
+        accept_alert { first('.delete-item').click }
+        expect(page).to have_content 'The resource you were looking for could not be found.'
+      end
+    end
+
+    context "when the shipment has already been shipped" do
+      it "shows the proper error message" do
+        expect(page).to have_selector '.delete-item'
+        order.shipments.first.ship!
+        accept_alert { first('.delete-item').click }
+        expect(page).to have_content 'Cannot remove items from a shipped shipment'
+      end
+    end
+  end
+
   context "moving variants between shipments", js: true do
     let!(:order) { create(:completed_order_with_pending_payment, number: "R100", state: "complete", line_items_count: 5) }
     let!(:la) { create(:stock_location, name: "LA") }