Handle setting to nil correctly
v0.3.1