Removed a potential NPE