                     (str (:client-id opts) listener-fn)))
                 connection
                 setup-fn)]
-    (waiting-derefable #(.hasStartedAtLeastOnce group) group)))
+    (waiting-derefable #(.hasStartedAtLeastOnce group) [group dest-name])))
 
 (defn- remote-listen? [dest {:keys [izer connection]} {:keys [host]}]
   (or (not izer)

   call. The deref will resolve to a boolean that is true if there was
   actually something to unlisten, false otherwise."
  [listener]
  (when-let [group (maybe-deref listener)]
    (future
      (if (or (instance? java.io.Closeable group)
              (instance? javax.jms.Connection group))

        (.setMessageListener (consumer-fn session)
          (create-listener handler))))
    (.start connection)
    [connection (destination-name dest)]
    (catch Throwable e
      (close-connection connection)
      (throw e))))
