Error Handling Update

Upgraded error handling, changed simple formatting