Wasn't the point of this PR to avoid NOTICEs? So we should be using `if (empty(...) && empty(...)) {`. Right?