gustafn
committed
on 31 May 16
- improve handling of incorrect input