Minor fixes

Did you know it actually returns errors?
I sure didn't.