The earlier we catch errors in user input, the better. Change-Id: Icee656f1373a993b6883ffaab441fe178c0fe8cb