* Fixed Error Messages not displaying
* Improved Error Handling