Cleaned up error handling

* Added README