diff --git a/src/filesystem/Filesystem.php b/src/filesystem/Filesystem.php
index 981d4feb..dd6e984a 100644
--- a/src/filesystem/Filesystem.php
+++ b/src/filesystem/Filesystem.php
@@ -275,7 +275,7 @@ final class Filesystem extends Phobject {
       $trap->destroy();
 
       if (!$ok) {
-        if (strlen($err)) {
+        if ($err !== null && strlen($err)) {
           throw new FilesystemException(
             $to,
             pht(
@@ -307,7 +307,7 @@ final class Filesystem extends Phobject {
    * @task   file
    */
   public static function remove($path) {
-    if (!strlen($path)) {
+    if ($path == null || !strlen($path)) {
       // Avoid removing PWD.
       throw new Exception(
         pht(
@@ -673,7 +673,7 @@ final class Filesystem extends Phobject {
     }
 
     // If we come back with an encoding, strip it off.
-    if (strpos($mime_type, ';') !== false) {
+    if ($mime_type !== null && strpos($mime_type, ';') !== false) {
       list($type, $encoding) = explode(';', $mime_type, 2);
       $mime_type = $type;
     }
diff --git a/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php b/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
index d2c86fd0..82a98cbb 100644
--- a/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
+++ b/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
@@ -289,7 +289,7 @@ final class ArcanistWorkingCopyIdentity extends Phobject {
   }
 
   public function readLocalArcConfig() {
-    if (strlen($this->localMetaDir)) {
+    if ($this->localMetaDir !== null && strlen($this->localMetaDir)) {
       $local_path = Filesystem::resolvePath('arc/config', $this->localMetaDir);
 
       $console = PhutilConsole::getConsole();