Better error handling

true