diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 52268da257..36fec7f36d 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -38,9 +38,12 @@ public class SnitchProperties
         String configURL = System.getProperty(RACKDC_PROPERTY_FILENAME);
         try
         {
-            URL url = new URL(configURL);
+            URL url;
             if (configURL == null)
                 url = SnitchProperties.class.getClassLoader().getResource(RACKDC_PROPERTY_FILENAME);
+            else 
+            	url = new URL(configURL);
+            
             stream = url.openStream(); // catch block handles potential NPE
             properties.load(stream);
         }