diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
index e2f8cf04f4b..0aa3a4bc517 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
@@ -78,7 +78,7 @@ class ResultSetImpl implements ResultSet {
       this.firstTuple = this.solrStream.read();
       this.solrStream.pushBack(firstTuple);
     } catch (IOException e) {
-      throw new SQLException("Couldn't read first tuple", e);
+      throw new SQLException(e);
     }
 
     this.resultSetMetaData = new ResultSetMetaDataImpl(this);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
index e1e9739511f..572491e31e8 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
@@ -396,6 +396,21 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
       }
     }
 
+
+    //Test error propagation
+    props = new Properties();
+    props.put("aggregationMode", "facet");
+    try (Connection con = DriverManager.getConnection("jdbc:solr://" + zkHost + "?collection=collection1", props)) {
+      try (Statement stmt = con.createStatement()) {
+        try (ResultSet rs = stmt.executeQuery("select crap from collection1 group by a_s " +
+            "order by sum(a_f) desc")) {
+        } catch (Exception e) {
+          String errorMessage = e.getMessage();
+          assertTrue(errorMessage.contains("Group by queries must include atleast one aggregate function"));
+        }
+      }
+    }
+
     testDriverMetadata();
   }