diff -r edb49073227e -r 2b1980a038b1 etherlab/plc_etherlab.c
--- a/etherlab/plc_etherlab.c	Fri Apr 05 11:55:09 2013 +0900
+++ b/etherlab/plc_etherlab.c	Fri Apr 05 16:49:41 2013 +0900
@@ -48,17 +48,22 @@
     size_t result_size;
     
 	master = ecrt_request_master(%(master_number)d);
-	if (!master) return -1;
+	if (!master) {
+        SLOGF(LOG_CRITICAL, "EtherCAT master request failed!");
+        return -1;
+    }
 
-	domain1 = ecrt_master_create_domain(master);
-	if (!domain1) return -1;
+	if(!(domain1 = ecrt_master_create_domain(master))){
+        SLOGF(LOG_CRITICAL, "EtherCAT Domain Creation failed!");
+        goto ecat_failed;
+    }
 
     // slaves PDO configuration
 %(slaves_configuration)s
 
     if (ecrt_domain_reg_pdo_entry_list(domain1, domain1_regs)) {
-        SLOGF(LOG_CRITICAL, "PDO entry registration failed!\n");
-        return -1;
+        SLOGF(LOG_CRITICAL, "EtherCAT PDO registration failed!");
+        goto ecat_failed;
     }
 
 	ecrt_master_set_send_interval(master, common_ticktime__);
@@ -69,19 +74,26 @@
     // extracting default value for not mapped entry in output PDOs
 %(slaves_output_pdos_default_values_extraction)s
 
-    if (ecrt_master_activate(master))
-        return -1;
+    if (ecrt_master_activate(master)){
+        SLOGF(LOG_CRITICAL, "EtherCAT Master activation failed");
+        goto ecat_failed;
+    }
 
     if (!(domain1_pd = ecrt_domain_data(domain1))) {
-        SLOGF(LOG_CRITICAL, "domain1_pd:  0x%%.6lx\n", (unsigned long)domain1_pd);
-        return -1;
+        SLOGF(LOG_CRITICAL, "Failed to map EtherCAT process data");
+        goto ecat_failed;
     }
 
-    SLOGF(LOG_INFO, "Master %(master_number)d activated...\n");
+    SLOGF(LOG_INFO, "Master %(master_number)d activated.");
     
     first_sent = 0;
 
     return 0;
+
+ecat_failed:
+	ecrt_release_master(master);
+    return -1;
+
 }
 
 void __cleanup_%(location)s(void)