diff --git a/src/api/config_info.c b/src/api/config_info.c
index 03558ba371268a2773cc487f441da1f88b78e27b..f3801fedfa68cb80de75dbbf3f4963a7265db397 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -60,14 +60,15 @@ slurm_load_build (time_t update_time, struct build_table **build_table_ptr )
 	if ( ( rc = slurm_send_controller_msg ( sockfd , & request_msg ) ) == SLURM_SOCKET_ERROR )
 		return SLURM_SOCKET_ERROR ;	
 	
-
 	/* receive message */
 	if ( ( msg_size = slurm_receive_msg ( sockfd , & response_msg ) ) == SLURM_SOCKET_ERROR )
 		return SLURM_SOCKET_ERROR ;	
 	/* shutdown message connection */
 	if ( ( rc = slurm_shutdown_msg_conn ( sockfd ) ) == SLURM_SOCKET_ERROR )
 		return SLURM_SOCKET_ERROR ;	
-	
+	if ( msg_size )
+		return msg_size;
+
 	switch ( response_msg . msg_type )
         {
                 case RESPONSE_BUILD_INFO:
diff --git a/src/api/job_info.c b/src/api/job_info.c
index d2fc94db63ce7be8dde0fabfa0f72c97e8580d13..d58ae7eef845d9710d14289e2c69f2bc59b9e7c5 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -123,6 +123,8 @@ slurm_load_jobs (time_t update_time, job_info_msg_t **job_info_msg_pptr)
         /* shutdown message connection */
         if ( ( rc = slurm_shutdown_msg_conn ( sockfd ) ) == SLURM_SOCKET_ERROR )
                 return SLURM_SOCKET_ERROR ;
+	if ( msg_size )
+		return msg_size;
 
 	switch ( response_msg . msg_type )
 	{
diff --git a/src/api/node_info.c b/src/api/node_info.c
index 0e5c769e8a9f477d8953c7c18b59d7d5f97a88e1..2a03d1ee99dab9449dc1ce9f34ab12795becd8c6 100644
--- a/src/api/node_info.c
+++ b/src/api/node_info.c
@@ -106,6 +106,8 @@ slurm_load_node (time_t update_time, node_info_msg_t **node_info_msg_pptr)
         /* shutdown message connection */
         if ( ( rc = slurm_shutdown_msg_conn ( sockfd ) ) == SLURM_SOCKET_ERROR )
                 return SLURM_SOCKET_ERROR ;
+	if ( msg_size )
+		return msg_size;
 
 	switch ( response_msg . msg_type )
 	{
diff --git a/src/api/partition_info.c b/src/api/partition_info.c
index 37998dc00407eec8fd4f9cd950945631e23d8ab2..c7db112aab9e4270f687c3aaeca484d378c355d7 100644
--- a/src/api/partition_info.c
+++ b/src/api/partition_info.c
@@ -100,6 +100,8 @@ slurm_load_partitions (time_t update_time, partition_info_msg_t **partition_info
         /* shutdown message connection */
         if ( ( rc = slurm_shutdown_msg_conn ( sockfd ) ) == SLURM_SOCKET_ERROR )
                 return SLURM_SOCKET_ERROR ;
+	if ( msg_size )
+		return msg_size;
 
 	switch ( response_msg . msg_type )
 	{
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index d7c67b593238f0d19ba87232d07abb4b15ec3d44..fe8baa899b80a9093cc05ef6ed2fea660c3e59fc 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -598,7 +598,7 @@ void pack_job_desc ( job_desc_msg_t * job_desc_ptr, void ** buf_ptr , int * buff
 
 }
 
-/* unpack_msg
+/* unpack_job_desc
  * unpacks a job_desc struct
  * header 	- the body structure to unpack
  * buf_ptr	- destination of the pack, note buffer will be incremented by underlying unpack routines
diff --git a/src/common/slurm_protocol_util.c b/src/common/slurm_protocol_util.c
index 96f0de79f493db029caffc73be2c2acfc3a325d0..c2b27ff3d029063503ff686b93360e17805a0a4e 100644
--- a/src/common/slurm_protocol_util.c
+++ b/src/common/slurm_protocol_util.c
@@ -8,7 +8,7 @@ uint32_t check_header_version( header_t * header)
 {
 	if ( header -> version != SLURM_PROTOCOL_VERSION )
 	{
-		debug ( "Invalid Protocol Version from " ) ;
+		info ( "Invalid Protocol Version %d ", header -> version ) ;
 		return SLURM_PROTOCOL_VERSION_ERROR ;
 	}
 	return SLURM_PROTOCOL_SUCCESS ;