Add input error handling + keep console open on completion