diff --git a/debian/changelog b/debian/changelog
index 796860b..49f9d12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spkitlasso (0.2-1) intrepid; urgency=low
+
+  * Packaging bzr r107 from my branch. 
+
+ -- Benjamin Dauvergne <bdauvergne@dell-desktop.example.com>  Mon, 30 Jun 2008 13:03:25 +0200
+
 spkitlasso (0.2) unstable; urgency=low
 
   * Setup the library into /usr/share/php/spkitlasso
diff --git a/endpoints/configure.php b/endpoints/configure.php
index 7947d01..318f308 100644
--- a/endpoints/configure.php
+++ b/endpoints/configure.php
@@ -18,19 +18,20 @@ if (isset($_POST)) {
         &&   (isset($_POST['idp_metadata']) 
            || isset($_POST['idp_metadata_url']))) 
     {
-        $ret = $configgen->makeConfig(
+        $error = "";
+        try {
+            $configgen->importConfigFromPost($_POST);
+            $ret = $configgen->makeConfig(
                 $_POST['organization'],
                 $_POST['idp_metadata'],
                 $_POST['idp_metadata_url'],
                 isset($_POST['clear_pkey']),
                 $error);
-
-        if ($ret) {
-            try {
-                $configgen->importConfigFromPost($_POST);
-            } catch (Exception $e) {
-                lassospkit_showCode($e);
+            if ($ret) {
+        	    lassospkit_showCode($error);
             }
+        } catch (Exception $e) {
+    	    lassospkit_showCode($e);
         }
     }
 }