Added error handling / cleanup
Merge pull request #5 from andypiper/cleanup

Added error handling / cleanup