Fix for NPE spam