killbill-memoizeit

diff --git a/overdue/src/main/java/com/ning/billing/overdue/service/DefaultOverdueService.java b/overdue/src/main/java/com/ning/billing/overdue/service/DefaultOverdueService.java
index 3153f0e..a42e757 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/service/DefaultOverdueService.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/service/DefaultOverdueService.java
@@ -61,7 +61,9 @@ public class DefaultOverdueService implements ExtendedOverdueService {
             try {
                 System.out.println("Overdue config URI" + properties.getConfigURI());
                 URI u = new URI(properties.getConfigURI());
-                overdueConfig = XMLLoader.getObjectFromUri(u, OverdueConfig.class);
+                if(u != null) {
+                    overdueConfig = XMLLoader.getObjectFromUri(u, OverdueConfig.class);
+                }
 
                 isInitialized = true;
             } catch (Exception e) {

diff --git a/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapper.java b/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapper.java
index 97220d5..5b811ee 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapper.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapper.java
@@ -51,6 +51,10 @@ public class OverdueWrapper<T extends Blockable> {
 
     public OverdueState<T> refresh() throws OverdueError, OverdueApiException {
         try {
+	    if(overdueStateSet == null) { // No configuration available
+		return null;
+	    } 
+
             OverdueState<T> nextOverdueState;
             BillingState<T> billingState    = billingStateCalcuator.calculateBillingState(overdueable);
             String previousOverdueStateName = api.getBlockingStateFor(overdueable).getStateName();