Includes error handling
Merge pull request #2 from danielchaves2/error_handling

Includes error handling