Index: source/ariba/utility/bootstrap/BootstrapManager.cpp
===================================================================
--- source/ariba/utility/bootstrap/BootstrapManager.cpp	(revision 7535)
+++ source/ariba/utility/bootstrap/BootstrapManager.cpp	(revision 7536)
@@ -111,5 +111,5 @@
 
 	ModuleMap::iterator i = modules.find(type);
-	if( i != modules.end() ) return RegistrationFailed;
+	if( i == modules.end() ) return RegistrationFailed;
 
 	BootstrapModule* module = i->second;
Index: source/ariba/utility/system/Timer.cpp
===================================================================
--- source/ariba/utility/system/Timer.cpp	(revision 7535)
+++ source/ariba/utility/system/Timer.cpp	(revision 7536)
@@ -55,11 +55,7 @@
 Timer::~Timer() {
 #ifndef UNDERLAY_OMNET
-	if( running ){
-		running = false;
-
-		timerThread->join();
-		delete timerThread;
-		timerThread = NULL;
-	}
+	stop();
+	delete timerThread;
+	timerThread = NULL;
 #endif // UNDERLAY_OMNET
 }
@@ -101,4 +97,5 @@
 	reset(); // cause the sleep to abort
 	SystemQueue::instance().dropAll(this);
+	timerThread->join();
 }