Add empty argument check

Still a possible match as whown by real world examples.