can you please take a look at 0d38080 ? is it acceptable error handling?