Continue patching null pointer field issue