fix: Check for null result in error handling

fix: Check for null result in error handling #373