diff --git a/pom.xml b/pom.xml
index 5748c69..593aa4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.helenus</groupId>
     <artifactId>helenus-core</artifactId>
-    <version>2.0.35-SNAPSHOT</version>
+    <version>2.0.36-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>helenus</name>
diff --git a/src/main/java/net/helenus/core/operation/AbstractOperation.java b/src/main/java/net/helenus/core/operation/AbstractOperation.java
index d967c1c..46739b9 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOperation.java
@@ -52,7 +52,7 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>>
   }
 
   public E sync(UnitOfWork uow) {
-    Objects.requireNonNull(uow, "Unit of Work should not be null.");
+    if (uow == null) return sync();
 
     final Timer.Context context = requestLatency.time();
     try {
@@ -69,7 +69,7 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>>
   }
 
   public CompletableFuture<E> async(UnitOfWork uow) {
-    Objects.requireNonNull(uow, "Unit of Work should not be null.");
+    if (uow == null) return async();
     return CompletableFuture.<E>supplyAsync(() -> sync(uow));
   }
 
diff --git a/src/main/java/net/helenus/core/operation/Operation.java b/src/main/java/net/helenus/core/operation/Operation.java
index fb7d4a6..d349ada 100644
--- a/src/main/java/net/helenus/core/operation/Operation.java
+++ b/src/main/java/net/helenus/core/operation/Operation.java
@@ -26,9 +26,9 @@ public abstract class Operation<E> {
     Operation(AbstractSessionOperations sessionOperations) {
         this.sessionOps = sessionOperations;
         MetricRegistry metrics = sessionOperations.getMetricRegistry();
-        this.uowCacheHits = metrics.meter("helenus.UOW-cache-hits");
-        this.uowCacheMiss = metrics.meter("helenus.UOW-cache-miss");
-        this.requestLatency = metrics.timer("helenus.request-latency");
+        this.uowCacheHits = metrics.meter("net.helenus.UOW-cache-hits");
+        this.uowCacheMiss = metrics.meter("net.helenus.UOW-cache-miss");
+        this.requestLatency = metrics.timer("net.helenus.request-latency");
     }
 
     public ResultSet execute(AbstractSessionOperations session, UnitOfWork uow, TraceContext traceContext, boolean showValues, boolean cached) {