Error handling
Error handling almost perfect
Fixed merge conflict
Merge pull request #33 from nickmeehan/error_handling

Error handling