Fixed some issues with null handling and readers