diff --git a/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java b/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java
index 538fcf30..d70e359d 100644
--- a/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java
+++ b/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java
@@ -285,7 +285,6 @@ public class TildeFriendsActivity extends Activity {
 					} catch (InterruptedException e) {
 					}
 				}
-				log_thread = null;
 			}
 		});
 		log_thread.start();
@@ -336,9 +335,13 @@ public class TildeFriendsActivity extends Activity {
 	protected void onDestroy()
 	{
 		try {
-			log_queue.put(null);
+			if (log_queue != null) {
+					log_queue.put(null);
+			}
+			log_thread.join();
 		} catch (InterruptedException e) {
 		}
+		log_thread = null;
 		s_activity = null;
 		super.onDestroy();
 	}