Improved Terminal error handling. #11