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 = {