Add check for "no input" and "invalid input"