diff --git a/ndb/ndbapi-examples/ndbapi_async_example/Makefile b/ndb/ndbapi-examples/ndbapi_async_example/Makefile
index 4df9367fc29..55e4a13343f 100644
--- a/ndb/ndbapi-examples/ndbapi_async_example/Makefile
+++ b/ndb/ndbapi-examples/ndbapi_async_example/Makefile
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/mysys
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
diff --git a/ndb/ndbapi-examples/ndbapi_async_example1/Makefile b/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
index b6fc31a00e5..7f6ea0b4d25 100644
--- a/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
+++ b/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
@@ -8,11 +8,11 @@ LFLAGS = -Wall
 INCLUDE_DIR = ../../include
 LIB_DIR = -L../../src/.libs \
           -L../../../libmysql_r/.libs \
-          -L../../../mysys
+          -L../../../mysys -L../../../strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
diff --git a/ndb/ndbapi-examples/ndbapi_event_example/Makefile b/ndb/ndbapi-examples/ndbapi_event_example/Makefile
index 07d244c9346..12e109c654f 100644
--- a/ndb/ndbapi-examples/ndbapi_event_example/Makefile
+++ b/ndb/ndbapi-examples/ndbapi_event_example/Makefile
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
 INCLUDE_DIR = $(TOP_SRCDIR)/ndb/include
 LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/mysys
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
diff --git a/ndb/ndbapi-examples/ndbapi_retries_example/Makefile b/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
index c7a8946cd9a..829a7009031 100644
--- a/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
+++ b/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
@@ -8,11 +8,11 @@ LFLAGS = -Wall
 INCLUDE_DIR = ../../include
 LIB_DIR = -L../../src/.libs \
           -L../../../libmysql_r/.libs \
-          -L../../../mysys
+          -L../../../mysys -L../../../strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
diff --git a/ndb/ndbapi-examples/ndbapi_scan_example/Makefile b/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
index c5883757e5e..31886b02bf1 100644
--- a/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
+++ b/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/mysys
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
diff --git a/ndb/ndbapi-examples/ndbapi_simple_example/Makefile b/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
index 99d4bfe68a6..0a59584fb66 100644
--- a/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
+++ b/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/mysys
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
diff --git a/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile b/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
index dc17ff0eeaa..d4356055935 100644
--- a/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
+++ b/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
 INCLUDE_DIR = $(TOP_SRCDIR)
 LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
           -L$(TOP_SRCDIR)/libmysql_r/.libs \
-          -L$(TOP_SRCDIR)/mysys
+          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/ndb/src/common/transporter/TransporterRegistry.cpp
index cbe2ae5ca3b..f331b1660c1 100644
--- a/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/ndb/src/common/transporter/TransporterRegistry.cpp
@@ -1531,12 +1531,16 @@ bool TransporterRegistry::connect_client(NdbMgmHandle *h)
   Uint32 mgm_nodeid= ndb_mgm_get_mgmd_nodeid(*h);
 
   if(!mgm_nodeid)
+  {
+    ndbout_c("%s: %d", __FILE__, __LINE__);
     return false;
-
+  }
   Transporter * t = theTransporters[mgm_nodeid];
   if (!t)
+  {
+    ndbout_c("%s: %d", __FILE__, __LINE__);
     return false;
-
+  }
   DBUG_RETURN(t->connect_client(connect_ndb_mgmd(h)));
 }
 
@@ -1550,6 +1554,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
 
   if ( h==NULL || *h == NULL )
   {
+    ndbout_c("%s: %d", __FILE__, __LINE__);
     return NDB_INVALID_SOCKET;
   }
 
@@ -1562,6 +1567,10 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
 				   m_transporter_interface[i].m_s_service_port,
 				   &mgm_reply) < 0)
     {
+      ndbout_c("Error: %s: %d",
+	       ndb_mgm_get_latest_error_desc(*h),
+	       ndb_mgm_get_latest_error(*h));
+      ndbout_c("%s: %d", __FILE__, __LINE__);
       ndb_mgm_destroy_handle(h);
       return NDB_INVALID_SOCKET;
     }
@@ -1572,7 +1581,13 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
    */
   NDB_SOCKET_TYPE sockfd= ndb_mgm_convert_to_transporter(h);
   if ( sockfd == NDB_INVALID_SOCKET)
+  {
+    ndbout_c("Error: %s: %d",
+	     ndb_mgm_get_latest_error_desc(*h),
+	     ndb_mgm_get_latest_error(*h));
+    ndbout_c("%s: %d", __FILE__, __LINE__);
     ndb_mgm_destroy_handle(h);
+  }
   return sockfd;
 }