Error handling

Lots of stuff happened!