diff --git a/maestro/pool_manager_registry.c b/maestro/pool_manager_registry.c
index 90205cb125391d538d671103d39d88f4b95857b4..29048114b68afe94f4af2730b0835e114dc002a8 100644
--- a/maestro/pool_manager_registry.c
+++ b/maestro/pool_manager_registry.c
@@ -142,12 +142,14 @@ mstro_pm_app_reg__entry_dispose(struct mstro_pm_app_registry_entry *e)
     ; /* owned by creator (?) */
   }
   
-  if(e->serialized_desc)
+  if(e->serialized_desc) {
     ; /* owned by creator (?) */
+  }
   //    free(e->serialized_desc);
   
-  if(e->transport_methods)
+  if(e->transport_methods) {
     ; /* owned by creator */
+  }
   
   if(e->component_name)
     free(e->component_name);
@@ -1063,7 +1065,7 @@ BAILOUT:
 
 BAILOUT_ERR:
   if(*result)
-    free(result);
+    free(*result);
   goto BAILOUT;
 }