diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
index c43e5ab934..11bf7328e9 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.apex.ast;
 
 import net.sourceforge.pmd.annotation.InternalApi;
 
+import com.google.summit.ast.expression.Expression;
 import com.google.summit.ast.expression.LiteralExpression;
 import com.google.summit.ast.modifier.ElementArgument;
 import com.google.summit.ast.modifier.ElementValue;
@@ -30,16 +31,19 @@ public class ASTAnnotationParameter extends AbstractApexNode.Single<ElementArgum
 
     public String getValue() {
         if (node.getValue() instanceof ElementValue.ExpressionValue) {
-            return expressionToString(((ElementValue.ExpressionValue) node.getValue()).getValue());
+            Expression value = ((ElementValue.ExpressionValue) node.getValue()).getValue();
+            if(value instanceof LiteralExpression) {
+                return literalToString((LiteralExpression) value);
+            }
         }
         return null;
     }
 
      public Boolean getBooleanValue() {
          if (node.getValue() instanceof ElementValue.ExpressionValue) {
-             ElementValue.ExpressionValue value = (ElementValue.ExpressionValue) node.getValue();
-             if (value.getValue() instanceof LiteralExpression.BooleanVal) {
-                 return ((LiteralExpression.BooleanVal) value.getValue()).getValue();
+             Expression value = ((ElementValue.ExpressionValue) node.getValue()).getValue();
+             if (value instanceof LiteralExpression.BooleanVal) {
+                 return ((LiteralExpression.BooleanVal) value).getValue();
              }
          }
          return false;
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
index a84738f1c9..4fb0c1f2cb 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
@@ -10,6 +10,7 @@ import net.sourceforge.pmd.annotation.InternalApi;
 import com.google.summit.ast.Identifier;
 import com.google.summit.ast.TypeRef;
 import com.google.summit.ast.expression.Expression;
+import com.google.summit.ast.expression.LiteralExpression;
 
 public class ASTField extends AbstractApexNode implements CanSuppressWarnings {
 
@@ -60,6 +61,9 @@ public class ASTField extends AbstractApexNode implements CanSuppressWarnings {
     }
 
     public String getValue() {
-        return expressionToString(value);
+        if(value instanceof LiteralExpression) {
+            return literalToString((LiteralExpression) value);
+        }
+        return null;
     }
 }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
index 46acbab9ac..029bf39821 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
@@ -80,7 +80,7 @@ public class ASTLiteralExpression extends AbstractApexNode.Single<LiteralExpress
 
     @Override
     public String getImage() {
-        return expressionToString(node);
+        return literalToString(node);
     }
 
     public String getName() {
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
index bb6184c1d5..9a1eb2c273 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
@@ -180,16 +180,13 @@ public abstract class AbstractApexNode extends AbstractApexNodeBase implements A
         return null;
     }
 
-    /** Returns the string value of the {@link Expression expr}. */
-    protected static String expressionToString(Expression expr) {
-        if (expr instanceof LiteralExpression) {
-            if (expr instanceof LiteralExpression.StringVal) {
-                return ((LiteralExpression.StringVal) expr).getValue();
-            } else if (expr instanceof LiteralExpression.NullVal) {
-                return "";
-            }
-            return ((LiteralExpression) expr).asCodeString();
+    /** Returns the string value of the {@link LiteralExpression}. */
+    protected static String literalToString(LiteralExpression expr) {
+        if (expr instanceof LiteralExpression.StringVal) {
+            return ((LiteralExpression.StringVal) expr).getValue();
+        } else if (expr instanceof LiteralExpression.NullVal) {
+            return "";
         }
-        return null;
+        return expr.asCodeString();
     }
 }