NullPointerFix for own patch set