diff --git a/ax25_pad.c b/ax25_pad.c
index bbf2561..2dccfda 100644
--- a/ax25_pad.c
+++ b/ax25_pad.c
@@ -724,6 +724,7 @@ packet_t ax25_dup (packet_t copy_from)
  *		out_heard	- True if "*" found.
  *
  * Returns:	True (1) if OK, false (0) if any error.
+ *		When 0, out_addr, out_ssid, and out_heard are unpredictable.
  *
  *
  *------------------------------------------------------------------------------*/
@@ -760,7 +761,7 @@ int ax25_parse_addr (int position, char *in_addr, int strict, char *out_addr, in
 	maxlen = strict ? 6 : (AX25_MAX_ADDR_LEN-1);
 	p = in_addr;
 	i = 0;
-	for (p = in_addr; *p != '\0' && *p != '-'; p++) {
+	for (p = in_addr; *p != '\0' && *p != '-' && *p != '*'; p++) {
 	  if (i >= maxlen) {
 	    text_color_set(DW_COLOR_ERROR);
 	    dw_printf ("%sAddress is too long. \"%s\" has more than %d characters.\n", position_name[position], in_addr, maxlen);
diff --git a/decode_aprs.c b/decode_aprs.c
index ab89140..55215c1 100644
--- a/decode_aprs.c
+++ b/decode_aprs.c
@@ -4838,7 +4838,7 @@ int main (int argc, char *argv[])
 
 	        ax25_format_addrs (pp, addrs);
 	        text_color_set(DW_COLOR_DECODED);
-	        dw_printf ("%s:", addrs);
+	        dw_printf ("%s", addrs);
 
 	        info_len = ax25_get_info (pp, &pinfo);
 	        ax25_safe_print ((char *)pinfo, info_len, 1);	// Display non-ASCII to hexadecimal.