Fixing error pass-through on cancel