Proper error handling

[Diastro]

Add proper error handling throughout the project

[dustinthughes]

If you need some help on the project - Would like to Co Author on this project.