diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
index af9ef971f..a8ac6d920 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
@@ -126,7 +126,7 @@ public class PacketHandler {
                 _state = 2;
                 UDPPacket packet = _endpoint.receive();
                 _state = 3;
-                if (packet == null) continue; // keepReading is probably false...
+                if (packet == null) break; // keepReading is probably false, or bind failed...
 
                 packet.received();
                 if (_log.shouldLog(Log.INFO))
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
index 5e83837b6..cb57dcf0f 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
@@ -44,8 +44,7 @@ public class UDPEndpoint {
             _sender.startup();
             _receiver.startup();
         } catch (SocketException se) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Unable to bind on " + _listenPort, se);
+            _log.log(Log.CRIT, "Unable to bind on port " + _listenPort, se);
         }
     }