Quick bandaid for NPE bug.