Avoid double check on empty string