Index: src/net/lemnik/eodsql/spi/util/SingleRowResultSetWrapper.java
===================================================================
--- src/net/lemnik/eodsql/spi/util/SingleRowResultSetWrapper.java	(revision 217)
+++ src/net/lemnik/eodsql/spi/util/SingleRowResultSetWrapper.java	(working copy)
@@ -3,6 +3,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import net.lemnik.eodsql.impl.ExceptionTranslator;
+
 /**
  * Created on 2008/06/15
  * @author Jason Morris
@@ -15,7 +17,12 @@
     @Override
     public T wrap(final ResultSet results) throws SQLException {
         if(results.next()) {
-            return binding.unmarshall(results);
+            final T wrapped = binding.unmarshall(results);
+            if (results.next())
+            {
+                throw ExceptionTranslator.uniqueResultExpected();
+            }
+            return wrapped;
         } else {
             return null;
         }