Some cleanup. 'Error' no longer shows