Fix issue where ship! errored due to state already being updated to shipped