Re-fix to get errors without specific messages showing properly on the frontend.
Fix to a case where a result listener could get a null result.