Final fix for null bug
Merge branch 'bug-fixes' into features