Making validation on manual entry slightly better

addresses #1006