diff --git a/samples/pet/src/pet_decode.c b/samples/pet/src/pet_decode.c
index 6e885236..8f6e50dd 100644
--- a/samples/pet/src/pet_decode.c
+++ b/samples/pet/src/pet_decode.c
@@ -36,8 +36,12 @@ static bool decode_Pet(
 	|| (((*result).species_choice == Pet_species_dog_c) && ((1)))
 	|| (((*result).species_choice == Pet_species_other_c) && ((1)))) || (zcbor_error(state, ZCBOR_ERR_WRONG_VALUE), false)))))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state))));
 
-	if (!tmp_result)
+	if (!tmp_result) {
 		zcbor_trace_file(state);
+		zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state)));
+	} else {
+		zcbor_log("%s success\r\n", __func__);
+	}
 
 	return tmp_result;
 }
diff --git a/samples/pet/src/pet_encode.c b/samples/pet/src/pet_encode.c
index 42485c40..e006a490 100644
--- a/samples/pet/src/pet_encode.c
+++ b/samples/pet/src/pet_encode.c
@@ -37,8 +37,12 @@ static bool encode_Pet(
 	: (((*input).species_choice == Pet_species_other_c) ? ((zcbor_uint32_put(state, (3))))
 	: false))))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, 3))));
 
-	if (!tmp_result)
+	if (!tmp_result) {
 		zcbor_trace_file(state);
+		zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state)));
+	} else {
+		zcbor_log("%s success\r\n", __func__);
+	}
 
 	return tmp_result;
 }
diff --git a/src/zcbor_common.c b/src/zcbor_common.c
index 38b26004..e6e1fafe 100644
--- a/src/zcbor_common.c
+++ b/src/zcbor_common.c
@@ -294,7 +294,6 @@ int zcbor_entry_function(const uint8_t *payload, size_t payload_len,
 		int err = zcbor_pop_error(state);
 
 		err = (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;
-		zcbor_log("Return error: %d\r\n", err);
 		return err;
 	}
 
diff --git a/zcbor/zcbor.py b/zcbor/zcbor.py
index 191d0460..baedb7f5 100755
--- a/zcbor/zcbor.py
+++ b/zcbor/zcbor.py
@@ -2630,8 +2630,12 @@ def render_function(self, xcoder, mode):
 
 	bool tmp_result = ({ body });
 
-	if (!tmp_result)
+	if (!tmp_result) {{
 		zcbor_trace_file(state);
+		zcbor_log("%s error: %s\\r\\n", __func__, zcbor_error_str(zcbor_peek_error(state)));
+	}} else {{
+		zcbor_log("%s success\\r\\n", __func__);
+	}}
 
 	return tmp_result;
 }}""".replace("	\n", "")  # call replace() to remove empty lines.