diff --git a/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java b/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java
index 783163032..87d20d48b 100644
--- a/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java
+++ b/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java
@@ -1023,7 +1023,7 @@ public BeaconHandler getBeaconHandler(String protocol, InetSocketAddress respons
 			Map<InetSocketAddress, BeaconHandlerImpl> protocolBeaconHandlersMap = beaconHandlers.get(protocol);
 			if (protocolBeaconHandlersMap == null) {
 				protocolBeaconHandlersMap = new HashMap<InetSocketAddress, BeaconHandlerImpl>();
-				beaconHandlers.get(protocolBeaconHandlersMap);
+				beaconHandlers.put(protocol, protocolBeaconHandlersMap);
 			}
 
 			BeaconHandlerImpl handler = protocolBeaconHandlersMap.get(responseFrom);