Better error handling for display