Fix possible NPE in QS

cheers

Change-Id: If663d37489ef09c5031b75ca31291b193849bd3c