Rudimentary checking for invalid input
Merge branch 'dev' of https://github.com/gabybarsky/cc3k into dev