Regression Fix on NPE