Dirty NPE fix revision attempt