better null handling
1.2.0