Revert !empty() check.

@mateu-aguilo-bosch this one reverts the !empty() -- and Travis seems to be happy about it :)