Removed an NPE vulnerability.