Fixes issue with possible null objects
v0.8.1