Fix up some input error handling