diff --git a/src/Application.hs b/src/Application.hs
index 2b5e6564c..13c579056 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -347,9 +347,9 @@ makeFoundation appSettings''@AppSettings{..} = do
 
       appAvsQuery <- case appAvsConf of 
         Nothing -> do
-          -- $logErrorS "avsPrepare" "appAvsConfig is empty, i.e. invalid AVS configuration settings."
-          -- return Nothing
-          error "AvsConfig is empty, i.e. invalid AVS configuration settings."          
+          $logErrorS "avsPrepare" "appAvsConfig is empty, i.e. invalid AVS configuration settings."
+          return Nothing
+          -- error "AvsConfig is empty, i.e. invalid AVS configuration settings."          
           
         Just avsConf -> do          
           manager <- newManagerSettings $ mkManagerSettings (def { settingDisableCertificateValidation = True }) Nothing