diff --git a/src/flash/nor/atsamv.c b/src/flash/nor/atsamv.c
index af48398e0..8f1450bf7 100644
--- a/src/flash/nor/atsamv.c
+++ b/src/flash/nor/atsamv.c
@@ -676,6 +676,9 @@ showall:
 		}
 		if ((who >= 0) && (((unsigned)who) < SAMV_NUM_GPNVM_BITS)) {
 			r = samv_get_gpnvm(target, who, &v);
+			if (r != ERROR_OK)
+				return r;
+
 			command_print(CMD, "samv-gpnvm%u: %u", who, v);
 			return r;
 		} else {