2 files changed, 3 insertions, 1 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 0ae903e2..e7692484 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -318,6 +318,7 @@ static int jabber_buddy_msg( struct im_connection *ic, char *who, char *message,
 		{
 			imcb_error( ic, "OAuth failure" );
 			imc_logout( ic, TRUE );
+			return 0;
 		}
 	}
 	
diff --git a/protocols/jabber/sasl.c b/protocols/jabber/sasl.c
index f232864b..f21a6706 100644
--- a/protocols/jabber/sasl.c
+++ b/protocols/jabber/sasl.c
@@ -447,7 +447,8 @@ void sasl_oauth2_init( struct im_connection *ic )
 static gboolean sasl_oauth2_remove_contact( gpointer data, gint fd, b_input_condition cond )
 {
 	struct im_connection *ic = data;
-	imcb_remove_buddy( ic, "jabber_oauth", NULL );
+	if( g_slist_find( jabber_connections, ic ) )
+		imcb_remove_buddy( ic, "jabber_oauth", NULL );
 	return FALSE;
 }