Patch this NPE too