diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 14d031414..d3445257d 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -649,11 +649,14 @@ int arm7_9_target_request_data(target_t *target, u32 size, u8 *buffer)
 int arm7_9_handle_target_request(void *priv)
 {
 	target_t *target = priv;
+	if (!target->type->examined)
+		return ERROR_OK;
 	armv4_5_common_t *armv4_5 = target->arch_info;
 	arm7_9_common_t *arm7_9 = armv4_5->arch_info;
 	arm_jtag_t *jtag_info = &arm7_9->jtag_info; 
 	reg_t *dcc_control = &arm7_9->eice_cache->reg_list[EICE_COMMS_CTRL];
 	
+	
 	if (!target->dbg_msg_enabled)
 		return ERROR_OK;
 		
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 653ebab09..94f68f698 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1336,6 +1336,8 @@ int cortex_m3_target_request_data(target_t *target, u32 size, u8 *buffer)
 int cortex_m3_handle_target_request(void *priv)
 {
 	target_t *target = priv;
+	if (!target->type->examined)
+		return ERROR_OK;
 	armv7m_common_t *armv7m = target->arch_info;
 	cortex_m3_common_t *cortex_m3 = armv7m->arch_info;
 	swjdp_common_t *swjdp = &cortex_m3->swjdp_info;