Error handling bug fixes
Fixes to cancel orders