From ddadcbbbd05bb36dd127758bd08b4608aa47bd20 Mon Sep 17 00:00:00 2001
From: Ivan Porto Carrero <ivan@flanders.co.nz>
Date: Fri, 20 Jan 2012 00:36:33 +0100
Subject: [PATCH] Throw a clearer error message when the socket handle is null

---
 .../src/main/scala/akka/zeromq/ConcurrentSocketActor.scala    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
index 3f6caad411..1540ec0ec0 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
@@ -142,7 +142,9 @@ private[zeromq] class ConcurrentSocketActor(params: Seq[SocketOption]) extends A
 
   private def socketFromParams() = {
     require(ZeroMQExtension.check[SocketType.ZMQSocketType](params), "A socket type is required")
-    (params collectFirst { case t: SocketType.ZMQSocketType ⇒ zmqContext.socket(t) } get)
+    (params
+      collectFirst { case t: SocketType.ZMQSocketType ⇒ zmqContext.socket(t) }
+      getOrElse (throw new NoSocketHandleException))
   }
 
   private def deserializerFromParams = {