Add some null ref checks to avoid exceptions within questor when panic kicks in