--- a/hgext/largefiles/overrides.py	Wed Jul 10 09:56:53 2019 +0200
+++ b/hgext/largefiles/overrides.py	Wed Jul 10 09:57:28 2019 +0200
@@ -459,7 +459,7 @@
     lfiles = set()
     for f in actions:
         splitstandin = lfutil.splitstandin(f)
-        if splitstandin in p1:
+        if splitstandin is not None and splitstandin in p1:
             lfiles.add(splitstandin)
         elif lfutil.standin(f) in p1:
             lfiles.add(f)