Improve error handling

In progress

Sun Jun 30 2024

Enhance the error handling mechanisms in the application.