diff --git a/lib/Analysis/CaptureTracking.cpp b/lib/Analysis/CaptureTracking.cpp
index f615881..7cd055dcd 100644
--- a/lib/Analysis/CaptureTracking.cpp
+++ b/lib/Analysis/CaptureTracking.cpp
@@ -98,6 +98,11 @@
           Worklist.push_back(U);
       }
       break;
+    case Instruction::ICmp:
+      // Comparing the pointer against null does not count as a capture.
+      if (isa<ConstantPointerNull>(I->getOperand(1)))
+        break;
+      return true;
     default:
       // Something else - be conservative and say it is captured.
       return true;