diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index a937d28b4..9754d0634 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1800,7 +1800,8 @@ void cortex_m_deinit_target(struct target *target)
 {
 	struct cortex_m_common *cortex_m = target_to_cm(target);
 
-	dap_dp_uninit(cortex_m->armv7m.debug_ap->dap);
+        if (cortex_m->armv7m.debug_ap)
+                dap_dp_uninit(cortex_m->armv7m.debug_ap->dap);
 
 	free(cortex_m->fp_comparator_list);