diff --git a/core/src/main/java/com/google/bitcoin/core/PeerEventListener.java b/core/src/main/java/com/google/bitcoin/core/PeerEventListener.java
index dc854e15..385279f7 100644
--- a/core/src/main/java/com/google/bitcoin/core/PeerEventListener.java
+++ b/core/src/main/java/com/google/bitcoin/core/PeerEventListener.java
@@ -44,7 +44,8 @@ public interface PeerEventListener {
     public void onChainDownloadStarted(Peer peer, int blocksLeft);
 
     /**
-     * Called when a peer is connected
+     * Called when a peer is connected. If this listener is registered to a {@link Peer} instead of a {@link PeerGroup},
+     * this will never be called.
      *
      * @param peer
      * @param peerCount the total number of connected peers
@@ -53,7 +54,8 @@ public interface PeerEventListener {
 
     /**
      * Called when a peer is disconnected. Note that this won't be called if the listener is registered on a
-     * {@link PeerGroup} and the group is in the process of shutting down.
+     * {@link PeerGroup} and the group is in the process of shutting down. If this listener is registered to a
+     * {@link Peer} instead of a {@link PeerGroup}, this will never be called.
      *
      * @param peer
      * @param peerCount the total number of connected peers
@@ -61,10 +63,13 @@ public interface PeerEventListener {
     public void onPeerDisconnected(Peer peer, int peerCount);
 
     /**
-     * Called when a message is received by a peer, before the message is processed. The returned message is
+     * <p>Called when a message is received by a peer, before the message is processed. The returned message is
      * processed instead. Returning null will cause the message to be ignored by the Peer returning the same message
      * object allows you to see the messages received but not change them. The result from one event listeners
-     * callback is passed as "m" to the next, forming a chain.
+     * callback is passed as "m" to the next, forming a chain.</p>
+     *
+     * <p>Note that this will never be called if registered with any executor other than
+     * {@link com.google.bitcoin.utils.Threading#SAME_THREAD}</p>
      */
     public Message onPreMessageReceived(Peer peer, Message m);