Fix 904 error handling, ugh