Prevent returning empty objects in case of nulls
1.0.1