Prevent the NPE fixed in the previous commit earlier on