Good Stuff

Issue #4 Error Handling @enigma