Better empty detection