fix for NPE spam