Trivial changes to avoid errors in case of invalid vehicle number

Try 58162 as input.

Thanks.