Update error handling

The error handling wasn't consistent with other uses,
update to bring in-line with other methods.