diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index e6bf425150..50bf98f0df 100644
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -1078,9 +1078,9 @@ def convert_latexcommand_index(document):
         if document.body[i + 1] != "LatexCommand index": # Might also be index_print
             i += 1
             continue
-        j = find_end_of_inset(document.body, i + 2)
+        j = find_end_of_inset(document.body, i + 1)
         if j == -1:
-            document.warning("Unable to find end of index inset at line " + i + "!")
+            document.warning("Unable to find end of index inset at line " + str(i) + "!")
             i += 2
             continue
         m = r1.match(document.body[i + 2])
diff --git a/status.16x b/status.16x
index 82b674c330..0b18c13c69 100644
--- a/status.16x
+++ b/status.16x
@@ -69,6 +69,7 @@ What's new
 - The menu separator special symbol is now direction aware, i.e., it
   points to the left in RTL-text (LaTeX output only) (bug 3560).
 
+- Fixed import of older files with empty index insets.
 
 * USER INTERFACE