Continue to fix the NULL bug