UPDATE: Tidy up display code for errors