Add timeouts and display error messages