--- a/hgext/largefiles/lfutil.py	Fri Mar 24 22:13:23 2017 +0900
+++ b/hgext/largefiles/lfutil.py	Fri Mar 24 22:24:58 2017 +0900
@@ -261,8 +261,8 @@
 
     ctx = repo[node]
     for filename in ctx.files():
-        if isstandin(filename) and filename in ctx.manifest():
-            realfile = splitstandin(filename)
+        realfile = splitstandin(filename)
+        if realfile is not None and filename in ctx.manifest():
             copytostore(repo, ctx.node(), realfile)
 
 def copytostoreabsolute(repo, file, hash):
@@ -478,8 +478,8 @@
 
     lfdirstate = openlfdirstate(repo.ui, repo)
     for f in ctx.files():
-        if isstandin(f):
-            lfile = splitstandin(f)
+        lfile = splitstandin(f)
+        if lfile is not None:
             synclfdirstate(repo, lfdirstate, lfile, False)
     lfdirstate.write()