#45 Fixed failing tests: check for null added