diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java
index 6d161aca9e..b1f933fed0 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java
@@ -98,12 +98,14 @@ public synchronized void stop() {
   @SuppressWarnings("rawtypes")
   private void logEventSourceEvent(NamedEventSource eventSource, String event) {
     if (log.isDebugEnabled()) {
-      if (eventSource instanceof ResourceEventSource) {
-        ResourceEventSource source = (ResourceEventSource) eventSource;
-        log.debug("{} event source {} for {}", event, eventSource.name(),
+      if (eventSource.original() instanceof ResourceEventSource) {
+        ResourceEventSource source = (ResourceEventSource) eventSource.original();
+        log.debug("{} event source {} for {}", event,
+            eventSource.isNameSet() ? eventSource.name() : eventSource,
             source.resourceType());
       } else {
-        log.debug("{} event source {}", event, eventSource.name());
+        log.debug("{} event source {}", event,
+            eventSource.isNameSet() ? eventSource.name() : eventSource);
       }
     }
   }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/NamedEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/NamedEventSource.java
index 4787e675c9..a1d1a601e4 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/NamedEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/NamedEventSource.java
@@ -72,7 +72,7 @@ public EventSource eventSource() {
 
   @Override
   public String toString() {
-    return original + " named: '" + name + "'}";
+    return original + " named: " + name;
   }
 
   public EventSource original() {