[#650] Avoid unnecessary null checks when validating questionId