Properly pass null
exception to error handlers
#3185
Merged
null
exception to error handlers
#3185