diff --git a/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java b/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java
index f3204cd05f..d6b3352428 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java
@@ -306,6 +306,12 @@ public static Expressions instance()
    
    private static void checkELExpression(final String expression)
    {
+	  
+      if (expression == null)
+      {
+         return;
+      }
+      
       for (int index = 0; blacklist.size() > index; index++)
       {
          if ( expression.contains(blacklist.get(index)) ) {
@@ -314,7 +320,7 @@ private static void checkELExpression(final String expression)
       }
       
       // for any case blacklist is not provided this is definitely not permitted
-      if ( expression.contains(".getClass()") )
+      if ( expression.contains(".getClass()") || expression.contains(".class()") )
       {
          throw new IllegalArgumentException("This EL expression is not allowed!");
       }