--- a/hgext/largefiles/lfcommands.py	Fri Mar 24 22:13:23 2017 +0900
+++ b/hgext/largefiles/lfcommands.py	Fri Mar 24 22:24:58 2017 +0900
@@ -244,10 +244,10 @@
             dstfiles.append(f)
 
     def getfilectx(repo, memctx, f):
-        if lfutil.isstandin(f):
+        srcfname = lfutil.splitstandin(f)
+        if srcfname is not None:
             # if the file isn't in the manifest then it was removed
             # or renamed, return None to indicate this
-            srcfname = lfutil.splitstandin(f)
             try:
                 fctx = ctx.filectx(srcfname)
             except error.LookupError: