now empty objects get turned to null correctly