Index: uspace/srv/console/console.c
===================================================================
--- uspace/srv/console/console.c	(revision 24ff4df07b987c77595be599054e03ca51ab8264)
+++ uspace/srv/console/console.c	(revision 1fcfc940d5ec6d6e9be0da114b9324a0b30b41c6)
@@ -510,19 +510,22 @@
 	
 	/* Connect to keyboard driver */
-	kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
-	while (kbd_phone < 0) {
-		usleep(10000);
-		kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
-	}
-	
-	if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
+	kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+	if (kbd_phone < 0) {
+		printf(NAME ": Failed to connect to keyboard service\n");
 		return -1;
+	}
+	
+	if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+		printf(NAME ": Failed to create callback from keyboard service\n");
+		return -1;
+	}
+	
 	async_new_connection(phonehash, 0, NULL, keyboard_events);
 	
 	/* Connect to framebuffer driver */
-	fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
-	while (fb_info.phone < 0) {
-		usleep(10000);
-		fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
+	fb_info.phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VIDEO, 0, 0);
+	if (fb_info.phone < 0) {
+		printf(NAME ": Failed to connect to video service\n");
+		return -1;
 	}
 	
