FixingMaster: Null pointer avoidance