Better error handling

Grab error, but otherwise let it through and return a “success”
message.