diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractFetchable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractFetchable.java
index 3e65d25777..aed978fa29 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractFetchable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractFetchable.java
@@ -1035,6 +1035,11 @@ abstract class AbstractFetchable<R extends Record> extends AbstractQueryPart imp
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public final R[] fetchArray() {
+        Result<R> r = fetch();
+
+        if (r.isNotEmpty())
+            return r.toArray((R[]) Array.newInstance(r.get(0).getClass(), r.size()));
+
         Class<? extends R> recordType;
 
         // TODO [#3185] Pull up getRecordType()
@@ -1045,7 +1050,6 @@ abstract class AbstractFetchable<R extends Record> extends AbstractQueryPart imp
         else
             throw new DataAccessException("Attempt to call fetchArray() on " + getClass());
 
-        Result<R> r = fetch();
         return r.toArray((R[]) Array.newInstance(recordType, r.size()));
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
index cc9f1fdf23..05056a9869 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
@@ -110,7 +110,7 @@ implements
     // -------------------------------------------------------------------------
     // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final DropTableImpl cascade() {
         this.cascade = true;