More thorough error handling

I think.