Quick NPE fix