Adding assert to delete order

Attempting to more gracefully handle an error on delete.

Change-Id: I104a37c3d3879b46709180a6305d4621a52e0b3b
Merge "Adding assert to delete order"