Added fix for addressOf nullPtr.