diff --git a/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedRequest.java b/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedRequest.java
index 4f86189129..8dd714bc74 100644
--- a/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedRequest.java
+++ b/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedRequest.java
@@ -110,8 +110,15 @@ public class SavedRequest implements java.io.Serializable {
 
         while (paramNames.hasNext()) {
             String paramName = (String) paramNames.next();
-            String[] paramValues = (String[]) parameters.get(paramName);
-            this.addParameter(paramName, paramValues);
+            Object o = parameters.get(paramName);
+            if (o instanceof String[]) {
+                String[] paramValues = (String[]) o;
+                this.addParameter(paramName, paramValues);
+            } else {
+            	if (logger.isWarnEnabled()) {
+                	logger.warn("ServletRequest.getParameterMap() returned non-String array");
+            	}
+            }
         }
 
         // Primitives