Better Error Handling

Woo!