diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java
index 759288f..a26468d 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java
@@ -138,7 +138,8 @@ public class ConstantResolver {
                     MethodDeclaration md = context.findMethodDeclaration(td, mi.getName().getIdentifier(), true);
                     if (md != null) {
                         String evaluated = evaluateMethodOutput(mi, md, context, visited);
-                        if (evaluated != null) return evaluated;
+                        System.out.println("EVALUATED " + mi.getName().getIdentifier() + " -> " + evaluated);
+                        if (evaluated != null && !evaluated.equals("null")) return evaluated;
                         
                         if (md.getReturnType2() != null) {
                             java.util.List<String> values = context.getEnumValues(md.getReturnType2().toString());
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetector.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetector.java
index a9a67dc..c311f38 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetector.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetector.java
@@ -133,6 +133,7 @@ public class GenericEventDetector {
             } else {
                  eventValue = context.resolveExpression(eventExpr);
             }
+            System.out.println("DETECTED EVENT EXPR: " + eventExpr + " -> " + eventValue);
         }
 
         MethodDeclaration method = findEnclosingMethod(node);