diff --git a/src/client.c b/src/client.c
index a34b9e887..aa2a0e944 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1952,7 +1952,7 @@ allocate_away(struct Client *client_p)
 void
 free_away(struct Client *client_p)
 {
-	if(client_p->user->away != NULL) {
+	if(client_p->user != NULL && client_p->user->away != NULL) {
 		rb_bh_free(away_heap, client_p->user->away);
 		client_p->user->away = NULL;
 	}