Index: src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java
===================================================================
--- src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java	(revision 2346)
+++ src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java	(working copy)
@@ -25,7 +25,8 @@
    }
 
    public Transaction getRunningTransaction() {
-      throw new IllegalStateException("this method can only be called for locally originated transactions!");
+      // this method is only valid for locally originated transactions!
+      return null;
    }
 
    public Object getLockOwner() {