added inital implementation of null-awareness
added a new test