Attempt to fix a NPE