CRITICAL: Better null handling of PMFs and users