[FIX] trade: Fixes and improvements to error handling