diff --git a/src/or/config.c b/src/or/config.c
index 61883b11a9..70472f3cc4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1515,11 +1515,18 @@ options_validate(or_options_t *options)
     result = -1;
   }
 
-  /* XXX might similarly want to check the other *BindAddress options */
   if (options->ORPort == 0 && options->ORBindAddress != NULL) {
     log(LOG_WARN, "ORPort must be defined if ORBindAddress is defined.");
     result = -1;
   }
+  if (options->DirPort == 0 && options->DirBindAddress != NULL) {
+    log(LOG_WARN, "DirPort must be defined if DirBindAddress is defined.");
+    result = -1;
+  }
+  if (options->SocksPort == 0 && options->SocksBindAddress != NULL) {
+    log(LOG_WARN, "SocksPort must be defined if SocksBindAddress is defined.");
+    result = -1;
+  }
 
   if (validate_data_directory(options)<0) {
     log(LOG_WARN, "Invalid DataDirectory");