handled NullExpression and added tests