some better null handling for MV