Fixing possible NPE