diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
index b3595c1b72..aa4f7e3f1e 100644
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -97,19 +97,19 @@ abstract class DiffusionController extends PhabricatorController {
     AphrontRequest $request) {
 
     $short_name = $request->getURIData('repositoryShortName');
-    if (strlen($short_name)) {
+    if (phutil_nonempty_string($short_name)) {
       // If the short name ends in ".git", ignore it.
       $short_name = preg_replace('/\\.git\z/', '', $short_name);
       return $short_name;
     }
 
     $identifier = $request->getURIData('repositoryCallsign');
-    if (strlen($identifier)) {
+    if (phutil_nonempty_string($identifier)) {
       return $identifier;
     }
 
     $id = $request->getURIData('repositoryID');
-    if (strlen($id)) {
+    if (phutil_nonempty_string($id)) {
       return (int)$id;
     }