Issue #52 Bunch of null handling