Clean up Null handling in MediaTypeResourceRegistry