diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 3d26869e51f..82fbc75723e 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-22  John Darrington  <john@darrington.wattle.id.au>
+
+	* s12z-dis.c (decode_possible_symbol): Add fallback case.
+	(rel_15_7): Likewise.
+
 2018-10-19  Tamar Christina  <tamar.christina@arm.com>
 
 	* arm-dis.c (UNKNOWN_INSTRUCTION_32BIT): Format specifier for arm mode.
diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c
index 6ca9f071f36..ad39e052175 100644
--- a/opcodes/s12z-dis.c
+++ b/opcodes/s12z-dis.c
@@ -378,6 +378,8 @@ decode_possible_symbol (bfd_vma addr, struct disassemble_info *info)
 	}
       if (j < info->symtab_size)
 	(*info->fprintf_func) (info->stream, "%s", bfd_asymbol_name (sym));
+      else
+        (*info->fprintf_func) (info->stream, "%" BFD_VMA_FMT "d", addr);
     }
 }
 
@@ -922,6 +924,8 @@ rel_15_7 (bfd_vma memaddr, struct disassemble_info* info, int offset)
 	}
       if (i < info->symtab_size)
 	(*info->fprintf_func) (info->stream, "%s", bfd_asymbol_name (sym));
+      else
+        (*info->fprintf_func) (info->stream, "*%+d", addr);
     }
 }