diff --git a/examples/hawkbit-example-ddi-client/pom.xml b/examples/hawkbit-example-ddi-client/pom.xml
index 7aa779493..f2eb9bb16 100644
--- a/examples/hawkbit-example-ddi-client/pom.xml
+++ b/examples/hawkbit-example-ddi-client/pom.xml
@@ -71,6 +71,12 @@
     <groupId>com.google.guava</groupId>
     <artifactId>guava</artifactId>
 </dependency>
+<dependency>
+    <groupId>commons-lang</groupId>
+    <artifactId>commons-lang</artifactId>
+    <version>2.3</version>
+</dependency>
+
 
 
       <!-- Test -->
diff --git a/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/DdiDefaultFeignClient.java b/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/DdiDefaultFeignClient.java
index d6e9dde96..7a042d7eb 100644
--- a/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/DdiDefaultFeignClient.java
+++ b/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/DdiDefaultFeignClient.java
@@ -8,6 +8,7 @@
  */
 package org.eclipse.hawkbit.ddi.client;
 
+import org.apache.commons.lang.Validate;
 import org.eclipse.hawkbit.ddi.client.resource.RootControllerResourceClient;
 
 import feign.Feign;
@@ -17,7 +18,7 @@ import feign.Logger.Level;
 import feign.jackson.JacksonEncoder;
 
 /**
- * @author Jonathan Knoblauch
+ * TODO
  *
  */
 public class DdiDefaultFeignClient {
@@ -32,18 +33,10 @@ public class DdiDefaultFeignClient {
         feignBuilder = Feign.builder().contract(new IgnoreMultipleConsumersProducersSpringMvcContract())
                 .requestInterceptor(new ApplicationJsonRequestHeaderInterceptor()).logLevel(Level.FULL)
                 .logger(new Logger.ErrorLogger()).encoder(new JacksonEncoder()).decoder(new DdiDecoder());
-
-        if (baseUrl == null) {
-            throw new IllegalStateException("A baseUrl has to be set");
-        }
-
-        if (tenant == null) {
-            throw new IllegalStateException("A tenant has to be set");
-        }
-
+        Validate.notNull(baseUrl, "A baseUrl has to be set");
+        Validate.notNull(tenant, "A tenant has to be set");
         this.baseUrl = baseUrl;
         this.tenant = tenant;
-
     }
 
     public Builder getFeignBuilder() {
@@ -52,12 +45,9 @@ public class DdiDefaultFeignClient {
 
     public RootControllerResourceClient getRootControllerResourceClient() {
 
-        // TODO tenant null throw exception
         if (rootControllerResourceClient == null) {
-
             String rootControllerResourcePath = this.baseUrl + RootControllerResourceClient.PATH;
             rootControllerResourcePath = rootControllerResourcePath.replace("{tenant}", tenant);
-
             rootControllerResourceClient = feignBuilder.target(RootControllerResourceClient.class,
                     rootControllerResourcePath);
         }
diff --git a/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java b/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java
index 78608b11d..09f82fa6d 100644
--- a/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java
+++ b/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java
@@ -1,6 +1,5 @@
 package org.eclipse.hawkbit.example.ddi.client;
 
-import org.eclipse.hawkbit.ddi.client.DdiExampleClient;
 import org.junit.Test;
 
 /**
@@ -10,11 +9,14 @@ public class AppTest {
 
     @Test
     public void AppTest() {
-
-        final DdiExampleClient ddiClient = new DdiExampleClient("http://localhost:8080/", "jktest", "DEFAULT");
-        ddiClient.run();
-
-        System.out.println("next steps........................");
+        // final DdiExampleClient ddiClient = new
+        // DdiExampleClient("http://localhost:8080/", "Einstein1", "DEFAULT",
+        // 2000,
+        // new SaveArtifactsStrategy());
+        // final Thread thread = new Thread(ddiClient);
+        // thread.run();
+        //
+        // System.out.println("next steps........................");
     }
 
 }