diff --git a/libasn1fix/asn1fix_constraint.c b/libasn1fix/asn1fix_constraint.c
index 3f30009eeaf408ab838c1a4d45969f0dcf227c1c..8c6c73ca943984de829ed9c9f14a0a9de636c81b 100644
--- a/libasn1fix/asn1fix_constraint.c
+++ b/libasn1fix/asn1fix_constraint.c
@@ -238,10 +238,12 @@ _constraint_value_resolve(arg_t *arg, asn1p_module_t *mod, asn1p_value_t **value
 
 	tmp_expr = asn1f_lookup_symbol(arg, mod, (*value)->value.reference);
 	if(tmp_expr == NULL) {
-		FATAL("Cannot find symbol %s "
+		FATAL("Cannot find symbol %s (%s) "
 			"used in %s subtype constraint at line %d",
 			asn1f_printable_reference((*value)->value.reference),
-			arg->expr->Identifier, arg->expr->_lineno);
+			mod->Identifier,
+			arg->expr->Identifier,
+			arg->expr->_lineno);
 		assert((*value)->type == ATV_REFERENCED);
 		return -1;
 	}
diff --git a/libasn1fix/asn1fix_crange.c b/libasn1fix/asn1fix_crange.c
index 53d46407f0ba02b50a00bd55a82007c82d29b1eb..e35ecad2aebaf5f842a335d4de58887528044210 100644
--- a/libasn1fix/asn1fix_crange.c
+++ b/libasn1fix/asn1fix_crange.c
@@ -326,7 +326,7 @@ static int _range_fill(asn1p_value_t *val, const asn1cnst_range_t *minmax, asn1c
 			return 0;
 		break;
 	case ATV_REFERENCED:
-		FATAL("Unrecognized constraint element \"%s\" at line %d",
+		FATAL("Unresolved constraint element \"%s\" at line %d",
 			asn1f_printable_reference(val->value.reference),
 			lineno);
 		return -1;