Better handling of null pointers during setup.
Beta 2.1!