NPE fix..maybe