Added input error handling and enabled keyboard input

Change-Id: Ie74da0b39d9002802c76dc3ceecd5082e7504f26
4 files changed