diff --git a/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java b/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java
index 38fc98fa8..70b360fa4 100644
--- a/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java
+++ b/jme3-networking/src/main/java/com/jme3/network/base/KernelAdapter.java
@@ -112,6 +112,8 @@ public class KernelAdapter extends Thread
         
         // Kill the kernel
         kernel.terminate();
+        
+        join();
     }
 
     protected void reportError( Endpoint p, Object context, Exception e )
@@ -119,7 +121,9 @@ public class KernelAdapter extends Thread
         // Should really be queued up so the outer thread can
         // retrieve them.  For now we'll just log it.  FIXME
         log.log( Level.SEVERE, "Unhandled error, endpoint:" + p + ", context:" + context, e );
-        
+
+        //if( p.isConnected() )
+        System.out.println("Is p connected:" + p.isConnected());
         // In lieu of other options, at least close the endpoint
         p.close();
     }                                                      
diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java b/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java
index c8aa5ddc2..7f992e94a 100644
--- a/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java
+++ b/jme3-networking/src/main/java/com/jme3/network/kernel/AbstractKernel.java
@@ -76,6 +76,18 @@ public abstract class AbstractKernel implements Kernel
         log.log( Level.SEVERE, "Unhanddled kernel error", e );
     }
 
+    protected void wakeupReader() {
+        // If there are no pending messages then add one so that the
+        // kernel-user knows to wake up if it is only listening for
+        // envelopes.
+        if( !hasEnvelopes() ) {
+            // Note: this is not really a race condition.  At worst, our
+            // event has already been handled by now and it does no harm
+            // to check again.
+            addEnvelope( EVENTS_PENDING );
+        }
+    }
+
     protected long nextEndpointId()
     {
         return nextId.getAndIncrement();
diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java
index e69a9e52a..4db90f68b 100644
--- a/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java
+++ b/jme3-networking/src/main/java/com/jme3/network/kernel/tcp/SelectorKernel.java
@@ -106,6 +106,9 @@ public class SelectorKernel extends AbstractKernel
         try {
             thread.close();
             thread = null;
+            
+            // Need to let any caller waiting for a read() wakeup 
+            wakeupReader();       
         } catch( IOException e ) {
             throw new KernelException( "Error closing host connection:" + address, e );
         }
@@ -164,15 +167,7 @@ public class SelectorKernel extends AbstractKernel
         // Enqueue an endpoint event for the listeners
         addEvent( EndpointEvent.createRemove( this, p ) );
 
-        // If there are no pending messages then add one so that the
-        // kernel-user knows to wake up if it is only listening for
-        // envelopes.
-        if( !hasEnvelopes() ) {
-            // Note: this is not really a race condition.  At worst, our
-            // event has already been handled by now and it does no harm
-            // to check again.
-            addEnvelope( EVENTS_PENDING );
-        }
+        wakeupReader();
     }
 
     /**
diff --git a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java
index 198b915dc..57ea17864 100644
--- a/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java
+++ b/jme3-networking/src/main/java/com/jme3/network/kernel/udp/UdpKernel.java
@@ -110,6 +110,9 @@ public class UdpKernel extends AbstractKernel
             thread.close();
             writer.shutdown();
             thread = null;
+            
+            // Need to let any caller waiting for a read() wakeup 
+            wakeupReader();       
         } catch( IOException e ) {
             throw new KernelException( "Error closing host connection:" + address, e );
         }
@@ -169,16 +172,8 @@ public class UdpKernel extends AbstractKernel
         log.log( Level.FINE, "Socket endpoints size:{0}", socketEndpoints.size() );
 
         addEvent( EndpointEvent.createRemove( this, p ) );
-        
-        // If there are no pending messages then add one so that the
-        // kernel-user knows to wake up if it is only listening for
-        // envelopes.
-        if( !hasEnvelopes() ) {
-            // Note: this is not really a race condition.  At worst, our
-            // event has already been handled by now and it does no harm
-            // to check again.
-            addEnvelope( EVENTS_PENDING );
-        }
+ 
+        wakeupReader();       
     }
 
     protected void newData( DatagramPacket packet )