Improve error handling in Question.java.
Improve error handling in Question.java.

Change-Id: I2d972c3f1827ba2dd5ddfdaf9aeaea559b627243
Signed-off-by: Chris Sinjakli <711c73f64afdce07b7e38039a96d2224209e9a6c@sinjakli.co.uk>

Sinjo/Trivial