Change error handling for other handlers