diff --git a/ChangeLog b/ChangeLog
index c1a4c0d..6518d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-23 Riccardo Mottola <rm@gnu.org>
+
+	* Framework/PCBundleManager.m
+	* Framework/PCProjectLauncher.m
+	Merge from branch: check bundle loading and warn.
+
 2016-03-15 18:47-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Modules/Debuggers/ProjectCenter/PTYView.h
diff --git a/Framework/PCBundleManager.m b/Framework/PCBundleManager.m
index 8084134..1e38280 100644
--- a/Framework/PCBundleManager.m
+++ b/Framework/PCBundleManager.m
@@ -129,6 +129,7 @@
   reqBundlesInfo = [self infoForBundlesType:extension];
   enumerator = [[reqBundlesInfo allKeys] objectEnumerator];
 
+  infoTable = nil;
   while ((bundlePath = [enumerator nextObject]))
     {
       infoTable = [reqBundlesInfo objectForKey:bundlePath];
@@ -167,6 +168,7 @@
   NSString     *bundlePath;
   NSDictionary *infoTable;
 
+  infoTable = nil;
   while ((bundlePath = [enumerator nextObject]))
     {
       infoTable = [reqBundlesInfo objectForKey:bundlePath];
@@ -235,6 +237,7 @@
 
   if (!className)
     {
+      NSLog(@"Bundle for class called with empty className");
       return nil;
     }
 
diff --git a/Framework/PCProjectLauncher.m b/Framework/PCProjectLauncher.m
index 08d7e83..efcf84f 100644
--- a/Framework/PCProjectLauncher.m
+++ b/Framework/PCProjectLauncher.m
@@ -41,7 +41,7 @@
 #endif
 
 #ifndef IMAGE
-#define IMAGE(X) [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:(X)]] autorelease]
+#define IMAGE(X) [NSImage imageNamed: X]
 #endif
 
 enum {
@@ -284,6 +284,8 @@ enum {
 			    fileName: [executablePath stringByDeletingLastPathComponent]];
   [debugger debugExecutableAtPath: executablePath
 	    withDebugger: gdbPath];
+  if (!debugger)
+    NSLog(@"No debugger module found");
 
   // turn debug button off...
   // [debugButton setState:NSOffState];