Quick Fix for NPE