diff --git a/trunk/src/or/connection_edge.c b/trunk/src/or/connection_edge.c
index 35500309ea..3cbd6ce2b8 100644
--- a/trunk/src/or/connection_edge.c
+++ b/trunk/src/or/connection_edge.c
@@ -985,6 +985,8 @@ int socks_policy_permits_address(uint32_t addr)
   if (options.SocksPolicy && !socks_policy)
     parse_socks_policy();
 
+  if(!socks_policy)
+    return 1;
   a = router_compare_addr_to_exit_policy(addr, 1, socks_policy);
   if (a==-1)
     return 0;