Improved the error handling in the dashboard