Merge commit '082985c68ad0b6c7f8c155cce2a5a79070176c09'

2 files changed, 5 insertions, 0 deletions

diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
index f9458609c3..b012ce7685 100644
--- a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
@@ -47,6 +47,10 @@ public class StatementHelper implements Serializable {
         if (parameter != null) {
             parameters.add(parameter);
             dataTypes.put(parameters.size() - 1, parameter.getClass());
+        } else {
+            throw new IllegalArgumentException(
+                    "You cannot add null parameters using addParamaters(Object). "
+                            + "Use addParameters(Object,Class) instead");
         }
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
index f2f13d1f35..d5ae77b442 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
@@ -242,6 +242,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
             // shim behind the shadow due to its transparency.
             shimElement.getStyle().setPosition(Position.ABSOLUTE);
             shimElement.getStyle().setBorderStyle(BorderStyle.NONE);
+            shimElement.setTabIndex(-1);
             shimElement.setFrameBorder(0);
             shimElement.setMarginHeight(0);
         }