Null ref fix
Merge branch 'BleedingEdge' of https://github.com/nico-rip/Questor into BleedingEdge