diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird/Scaffolding/Internal/FbDatabaseModelFactory.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird/Scaffolding/Internal/FbDatabaseModelFactory.cs
index 7bc317d1..1399daa8 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird/Scaffolding/Internal/FbDatabaseModelFactory.cs
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird/Scaffolding/Internal/FbDatabaseModelFactory.cs
@@ -343,11 +343,18 @@ private void GetIndexes(DbConnection connection, IReadOnlyList<DatabaseTable> ta
 							Name = reader.GetString(0).Trim(),
 							IsUnique = reader.GetBoolean(1),
 						};
-
+						bool skipIdx = false;
 						foreach (var column in reader.GetString(3).Split(','))
 						{
-							index.Columns.Add(table.Columns.Single(y => y.Name == column.Trim()));
+							var col = table.Columns.SingleOrDefault(y => y.Name == column.Trim());
+							if (col == null)
+							{
+								skipIdx = true;
+								break;
+							}
+							index.Columns.Add(col);
 						}
+						if(skipIdx) continue;
 
 						if (reader.GetBoolean(2))
 						{