*** lib/erl_interface/src/erl_connect.c	Thu Oct 11 17:03:29 2001
--- ../otp_src_R8B-1.fixed/lib/erl_interface/src/erl_connect.c	Tue May  7 15:06:13 2002
***************
*** 458,461 ****
  	int index = 0;
! 	if (ei_decode_term(x->buff, &index, &emsg->msg) < 0)
  	    r = ERL_ERROR;
      } else
--- 458,474 ----
  	int index = 0;
! 	emsg->type = msg.msgtype;
! 
! 	/* This is an ugly hack to avoid decode error when no payload */
! 	switch (msg.msgtype) {
! 	case ERL_LINK:
! 	case ERL_UNLINK:
! 	case ERL_GROUP_LEADER:
! 	  emsg->msg = NULL;
! 	  break;
! 	  
! 	default:
! 	  if (ei_decode_term(x->buff, &index, &emsg->msg) < 0)
  	    r = ERL_ERROR;
+ 	  break;
+ 	}
      } else