diff --git a/jbpm-services/jbpm-services-ejb/jbpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EJBTimerScheduler.java b/jbpm-services/jbpm-services-ejb/jbpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EJBTimerScheduler.java
index 93ebb6b546..41cafe0d47 100644
--- a/jbpm-services/jbpm-services-ejb/jbpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EJBTimerScheduler.java
+++ b/jbpm-services/jbpm-services-ejb/jbpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EJBTimerScheduler.java
@@ -282,12 +282,11 @@ public boolean removeJob(JobHandle jobHandle, Timer ejbTimer) {
 
     public TimerJobInstance getTimerByName(String jobName) {
         if (useLocalCache) {
-            TimerJobInstance found = localCache.get(jobName);
-            if (found != null) {
-                logger.debug("Timer {} found in cache", jobName);
-                return found;
+            if (localCache.containsKey(jobName)) {
+                TimerJobInstance found = localCache.get(jobName);
+                logger.debug("Found timer job instance with  name {} in cache, returning {}", jobName, found);
             }
-            logger.debug("Timer {} not found in cache", jobName);
+            logger.debug("Timer Job Instance with name {} not found in cache", jobName);
         }
         return linearSearch("search", jobName, (timer, job) -> {
             if (useLocalCache) {
@@ -321,7 +320,7 @@ private <T> Optional<T> linearSearch(String suffix, String uuid, BiFunction<Time
                         if (handle.getUuid().equals(uuid)) {
                             logger.debug("UIID {} does match timer {} and handle {}", uuid, timer,
                                     job.getTimerJobInstance());
-                            return Optional.of(function.apply(timer, job.getTimerJobInstance()));
+                            return Optional.ofNullable(function.apply(timer, job.getTimerJobInstance()));
                         }
                     }
                 } catch (NoSuchObjectLocalException e) {
@@ -335,7 +334,7 @@ private <T> Optional<T> linearSearch(String suffix, String uuid, BiFunction<Time
 
     public void evictCache(JobHandle jobHandle) {
         String jobName =  ((EjbGlobalJobHandle) jobHandle).getUuid();
-        logger.debug("Invalidate job {} with job name {} in cache", jobName, localCache.remove(jobName));
+        logger.debug("Invalidate job {} with job name {} in cache", localCache.remove(jobName), jobName);
     }
 
 }