Passing empty strings didn't worked: with this new check all is fine