diff --git a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
index dcffb995..0a693d02 100644
--- a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
+++ b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
@@ -48,6 +48,8 @@ public class AvroSchemaGenerator {
   private final ConnManager connManager;
   private final String tableName;
 
+  private final String DEFAULT_SCHEMA_NAME = "AutoGeneratedSchema";
+
   public AvroSchemaGenerator(final SqoopOptions opts, final ConnManager connMgr,
       final String table) {
     this.options = opts;
@@ -78,7 +80,7 @@ public Schema generate(String schemaNameOverride) throws IOException {
     }
 
     TableClassName tableClassName = new TableClassName(options);
-    String shortClassName = tableClassName.getShortClassForTable(tableName);
+    String shortClassName = tableName == null ? DEFAULT_SCHEMA_NAME : tableClassName.getShortClassForTable(tableName);
     String avroTableName = (tableName == null ? TableClassName.QUERY_RESULT : tableName);
     String avroName = schemaNameOverride != null ? schemaNameOverride :
         (shortClassName == null ? avroTableName : shortClassName);