What happened to German and USSR Ambassadors?

When Germany invaded the USSR on June 22, 1941, what happened to the German and USSR ambassadors (and their staffs) for each respective country? Did either make it make to their home country after the war?

The German ambassador in the USSR in June 1941 was Count Friedrich Werner von der Schulenberg. He was returned to Germany at the beginning of hostilities. He was active over the next three years in the Foreign Ministry, trying to soften Germany's occupation policy in the USSR. He was connected to people involved in the 20 July 1944 plot to assassinate Hitler and was considered as a possible Foreign Minister in the conspirators' plans for a post-coup government. He suffered as a result, losing his life at the hands of the Nazis.

The German Army Attache in Moscow was General Ernst Koestring, who likewise was returned to Germany at the beginning of hostilities He held several important commands during the war, including Chief of Eastern Troops in 1943-1944.

Returning diplomatic personnel to their home country was standard practice during World War II.