More Correct fix to null issue for Master inventory.