diff --git a/src/target/target.c b/src/target/target.c
index 7ab7a7c69..d1e807284 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -225,6 +225,16 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
 	
 	if ((event == TARGET_EVENT_HALTED) && (target->reset_script))
 	{
+		if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)
+		{
+			reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1);
+			u32 t=*((u32 *)reg->value);
+			if (t!=0)
+			{
+				LOG_ERROR("PC was not 0. Does this target does target need srst_pulls_trst?");
+			}
+		}
+
 		target_unregister_event_callback(target_init_handler, priv);
 
 		script = open_file_from_path(target->reset_script, "r");
@@ -394,18 +404,19 @@ int target_process_reset(struct command_context_s *cmd_ctx)
 		target = target->next;
 	}
 	
-	if (jtag_reset_config & RESET_SRST_PULLS_TRST)
-	{
-		/* If TRST was asserted we need to set up registers again */
-		if ((retval = target_examine(cmd_ctx)) != ERROR_OK)
-			return retval;
-	}
-	
 	if ((retval = jtag_execute_queue()) != ERROR_OK)
 	{
 		LOG_WARNING("JTAG communication failed while deasserting reset.");
 		retval = ERROR_OK;
 	}
+
+	if (jtag_reset_config & RESET_SRST_PULLS_TRST)
+	{
+		/* If TRST was asserted we need to set up registers again */
+		if ((retval = target_examine(cmd_ctx)) != ERROR_OK)
+			return retval;
+	}		
+	
 	
 	LOG_DEBUG("Waiting for halted stated as approperiate");