Better empty-check