diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
index 270545f2..f8d6becd 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -83,14 +83,17 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
             HAProxyMessage proxy = (HAProxyMessage) msg;
             try
             {
-                InetSocketAddress newAddress = new InetSocketAddress( proxy.sourceAddress(), proxy.sourcePort() );
-
-                ProxyServer.getInstance().getLogger().log( Level.FINE, "Set remote address via PROXY {0} -> {1}", new Object[]
+                if ( proxy.sourceAddress() != null )
                 {
-                    channel.getRemoteAddress(), newAddress
-                } );
+                    InetSocketAddress newAddress = new InetSocketAddress( proxy.sourceAddress(), proxy.sourcePort() );
 
-                channel.setRemoteAddress( newAddress );
+                    ProxyServer.getInstance().getLogger().log( Level.FINE, "Set remote address via PROXY {0} -> {1}", new Object[]
+                    {
+                        channel.getRemoteAddress(), newAddress
+                    } );
+
+                    channel.setRemoteAddress( newAddress );
+                }
             } finally
             {
                 proxy.release();