diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index f65db33..b8970c8 100644
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -29,10 +29,9 @@ class KafkaConfig private (val props: VerifiableProperties) extends ZKConfig(pro
 
   def this(originalProps: Properties) {
     this(new VerifiableProperties(originalProps))
+    props.verify()
   }
 
-  def verify() = props.verify()
-  
   /*********** General Configuration ***********/
   
   /* the broker id for this server */
diff --git a/core/src/main/scala/kafka/server/KafkaServerStartable.scala b/core/src/main/scala/kafka/server/KafkaServerStartable.scala
index 2121b75..39ea154 100644
--- a/core/src/main/scala/kafka/server/KafkaServerStartable.scala
+++ b/core/src/main/scala/kafka/server/KafkaServerStartable.scala
@@ -32,7 +32,6 @@ class KafkaServerStartable(val serverConfig: KafkaConfig) extends Logging {
   def startup() {
     try {
       server.startup()
-      serverConfig.verify()
     }
     catch {
       case e =>