Better error handling routines and display