diff --git a/src/servers/launch/BaseJob.cpp b/src/servers/launch/BaseJob.cpp
index 50398552bd..2dbec44a1d 100644
--- a/src/servers/launch/BaseJob.cpp
+++ b/src/servers/launch/BaseJob.cpp
@@ -17,6 +17,12 @@ BaseJob::BaseJob(const char* name)
 }
 
 
+BaseJob::~BaseJob()
+{
+	delete fCondition;
+}
+
+
 const char*
 BaseJob::Name() const
 {
diff --git a/src/servers/launch/BaseJob.h b/src/servers/launch/BaseJob.h
index f4108140be..df08964b29 100644
--- a/src/servers/launch/BaseJob.h
+++ b/src/servers/launch/BaseJob.h
@@ -18,6 +18,7 @@ class ConditionContext;
 class BaseJob : public BJob {
 public:
 								BaseJob(const char* name);
+								~BaseJob();
 
 			const char*			Name() const;
 
diff --git a/src/servers/launch/Conditions.cpp b/src/servers/launch/Conditions.cpp
index 6611f30aad..8c6c09c1de 100644
--- a/src/servers/launch/Conditions.cpp
+++ b/src/servers/launch/Conditions.cpp
@@ -119,6 +119,8 @@ Condition::~Condition()
 
 
 ConditionContainer::ConditionContainer(const BMessage& args)
+	:
+	fConditions(10, true)
 {
 	char* name;
 	type_code type;