diff --git a/libnotify/notification.c b/libnotify/notification.c
index de563d2..c8c7010 100644
--- a/libnotify/notification.c
+++ b/libnotify/notification.c
@@ -1694,11 +1694,9 @@ const char *
 notify_notification_get_activation_token (NotifyNotification *notification)
 {
         g_return_val_if_fail (NOTIFY_IS_NOTIFICATION (notification), NULL);
+        g_return_val_if_fail (notification->priv->activating, NULL);
 
-        if (notification->priv->activating)
-                return notification->priv->activation_token;
-
-        return NULL;
+        return notification->priv->activation_token;
 }
 
 gboolean