diff --git a/base/src/org/adempiere/util/ModelClassGenerator.java b/base/src/org/adempiere/util/ModelClassGenerator.java
index 5d5d9fc3ee..86f490a2b1 100644
--- a/base/src/org/adempiere/util/ModelClassGenerator.java
+++ b/base/src/org/adempiere/util/ModelClassGenerator.java
@@ -299,7 +299,8 @@ public class ModelClassGenerator
 			+ " AND c.ColumnName <> 'IsActive'"
 			+ " AND c.ColumnName NOT LIKE 'Created%'"
 			+ " AND c.ColumnName NOT LIKE 'Updated%' "
-			+ "ORDER BY c.ColumnName";
+			+ " AND c.IsActive='Y'"
+			+ " ORDER BY c.ColumnName";
 		PreparedStatement pstmt = null;
 		try
 		{
diff --git a/base/src/org/adempiere/util/ModelInterfaceGenerator.java b/base/src/org/adempiere/util/ModelInterfaceGenerator.java
index 039174a45d..fd89153ba1 100644
--- a/base/src/org/adempiere/util/ModelInterfaceGenerator.java
+++ b/base/src/org/adempiere/util/ModelInterfaceGenerator.java
@@ -240,7 +240,8 @@ public class ModelInterfaceGenerator {
 				+ " AND c.ColumnName <> 'IsActive'"
 				+ " AND c.ColumnName NOT LIKE 'Created%'"
 				+ " AND c.ColumnName NOT LIKE 'Updated%' "
-				+ "ORDER BY c.ColumnName";
+				+ " AND c.IsActive='Y'"
+				+ " ORDER BY c.ColumnName";
 		PreparedStatement pstmt = null;
 		try {
 			pstmt = DB.prepareStatement(sql, null);
@@ -483,7 +484,8 @@ public class ModelInterfaceGenerator {
 				return;
 		}
 		if (className.equals("byte[]")) {
-			System.out.println("ERROR");
+			log.warning("Invalid type - "+className);
+			return;
 		}
 		s_importClasses.add(className);
 	}