diff --git a/src/applications/auth/constants/PhabricatorCookies.php b/src/applications/auth/constants/PhabricatorCookies.php
index 9675d21d42..9dc9d823b2 100644
--- a/src/applications/auth/constants/PhabricatorCookies.php
+++ b/src/applications/auth/constants/PhabricatorCookies.php
@@ -164,7 +164,7 @@ final class PhabricatorCookies extends Phobject {
     // Old cookies look like: /uri
     // New cookies look like: timestamp,/uri
 
-    if (!strlen($cookie)) {
+    if (!phutil_nonempty_string($cookie)) {
       return null;
     }
 
diff --git a/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php b/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php
index 8babff859f..195d880fff 100644
--- a/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php
+++ b/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php
@@ -91,6 +91,9 @@ final class PhabricatorUserProfileImageCacheType
   }
 
   public function isRawCacheDataValid(PhabricatorUser $user, $key, $data) {
+    if ($data === null) {
+      return false;
+    }
     $parts = explode(',', $data, 2);
     $version = reset($parts);
     return ($version === $this->getCacheVersion($user));