Better error handling during dispatch