null handling undone