diff --git a/src/xfpm-button-xf86.c b/src/xfpm-button-xf86.c
index fbdce94..80bf8c4 100644
--- a/src/xfpm-button-xf86.c
+++ b/src/xfpm-button-xf86.c
@@ -150,10 +150,7 @@ xfpm_button_xf86_xevent_key (XfpmButtonXf86 *button, guint keysym , XfpmButtonKe
     guint keycode = XKeysymToKeycode (GDK_DISPLAY(), keysym);
 
     if ( keycode == 0 )
-    {
-	g_critical ("could not map keysym %x to keycode\n", keysym);
-	return FALSE;
-    }
+	g_warning ("could not map keysym %x to keycode\n", keysym);
     
     if ( !xfpm_button_xf86_grab_keystring(button, keycode)) 
     {
@@ -183,8 +180,8 @@ xfpm_button_xf86_setup (XfpmButtonXf86 *button)
 #endif 
 
 #ifdef HAVE_XF86XK_SUSPEND
-    if ( xfpm_button_xf86_xevent_key (button, XF86XK_Suspend, BUTTON_SLEEP) )
-	button->priv->mapped_buttons |= SLEEP_KEY;
+    if ( xfpm_button_xf86_xevent_key (button, XF86XK_Suspend, BUTTON_HIBERNATE) )
+	button->priv->mapped_buttons |= HIBERNATE_KEY;
 #endif 
 
     if ( xfpm_button_xf86_xevent_key (button, XF86XK_Sleep, BUTTON_SLEEP) )