Bug fix: Some non-standard forms of error return are not caught (#1877)

Bug fix: Some non-standard forms of error return are not caught (#1877) #699