Index: uspace/srv/fb/ega.c
===================================================================
--- uspace/srv/fb/ega.c	(revision fa094491c49be2130cd1f5bbad081181cbad82b1)
+++ uspace/srv/fb/ega.c	(revision 81c8d54932b8d433d80c1e2cc7f3bb31def15d79)
@@ -374,5 +374,5 @@
 	scr_height = sysinfo_value("fb.height");
 
-	if(sysinfo_value("fb.blinking")) {
+	if (sysinfo_value("fb.blinking")) {
 		ega_normal_color &= 0x77;
 		ega_inverted_color &= 0x77;
@@ -386,6 +386,7 @@
 	scr_addr = as_get_mappable_page(sz);
 
-	physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
-	    PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+	if (physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
+	    PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+		return -1;
 
 	async_set_client_connection(ega_client_connection);
Index: uspace/srv/fb/fb.c
===================================================================
--- uspace/srv/fb/fb.c	(revision fa094491c49be2130cd1f5bbad081181cbad82b1)
+++ uspace/srv/fb/fb.c	(revision 81c8d54932b8d433d80c1e2cc7f3bb31def15d79)
@@ -1672,6 +1672,7 @@
 	void *fb_addr = as_get_mappable_page(fbsize);
 	
-	physmem_map(fb_ph_addr + fb_offset, fb_addr,
-	    ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+	if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
+	    ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+		return -1;
 	
 	if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
Index: uspace/srv/fb/msim.c
===================================================================
--- uspace/srv/fb/msim.c	(revision fa094491c49be2130cd1f5bbad081181cbad82b1)
+++ uspace/srv/fb/msim.c	(revision 81c8d54932b8d433d80c1e2cc7f3bb31def15d79)
@@ -60,5 +60,6 @@
 	virt_addr = (char *) as_get_mappable_page(1);
 	
-	physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE);
+	if (physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE) != 0)
+		return -1;
 	
 	serial_console_init(msim_putc, WIDTH, HEIGHT);
Index: uspace/srv/fb/sgcn.c
===================================================================
--- uspace/srv/fb/sgcn.c	(revision fa094491c49be2130cd1f5bbad081181cbad82b1)
+++ uspace/srv/fb/sgcn.c	(revision 81c8d54932b8d433d80c1e2cc7f3bb31def15d79)
@@ -122,16 +122,10 @@
 int sgcn_init(void)
 {
-	sram_virt_addr = (uintptr_t) as_get_mappable_page(
-		sysinfo_value("sram.area.size"));
-	int result = physmem_map(
-		(void *) sysinfo_value("sram.address.physical"),
-		(void *) sram_virt_addr,
-		sysinfo_value("sram.area.size") / PAGE_SIZE,
-		AS_AREA_READ | AS_AREA_WRITE
-		);
-	if (result != 0) {
-		printf("SGCN: uspace driver couldn't map physical memory: %d\n",
-			result);
-	}
+	sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+	
+	if (physmem_map((void *) sysinfo_value("sram.address.physical"),
+	    (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
+	    AS_AREA_READ | AS_AREA_WRITE) != 0)
+		return -1;
 	
 	serial_console_init(sgcn_putc, WIDTH, HEIGHT);
Index: uspace/srv/kbd/arch/sparc64/src/sgcn.c
===================================================================
--- uspace/srv/kbd/arch/sparc64/src/sgcn.c	(revision fa094491c49be2130cd1f5bbad081181cbad82b1)
+++ uspace/srv/kbd/arch/sparc64/src/sgcn.c	(revision 81c8d54932b8d433d80c1e2cc7f3bb31def15d79)
@@ -98,15 +98,9 @@
 void sgcn_init(void)
 {
-	sram_virt_addr = (uintptr_t) as_get_mappable_page(
-		sysinfo_value("sram.area.size"));
-	int result = physmem_map(
-		(void *) sysinfo_value("sram.address.physical"),
-		(void *) sram_virt_addr,
-		sysinfo_value("sram.area.size") / PAGE_SIZE,
-		AS_AREA_READ | AS_AREA_WRITE
-		);
-	if (result != 0) {
+	sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+	if (physmem_map((void *) sysinfo_value("sram.address.physical"),
+	    (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
+	    AS_AREA_READ | AS_AREA_WRITE) != 0)
 		printf("SGCN: uspace driver could not map physical memory.");
-	}
 	
 	sram_buffer_offset = sysinfo_value("sram.buffer.offset");
Index: uspace/srv/ns/ns.c
===================================================================
--- uspace/srv/ns/ns.c	(revision fa094491c49be2130cd1f5bbad081181cbad82b1)
+++ uspace/srv/ns/ns.c	(revision 81c8d54932b8d433d80c1e2cc7f3bb31def15d79)
@@ -109,9 +109,8 @@
 }
 
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name,
-    void **addr)
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
 {
 	void *ph_addr;
-
+	
 	if (!*addr) {
 		ph_addr = (void *) sysinfo_value(name);
@@ -121,6 +120,9 @@
 		}
 		*addr = as_get_mappable_page(PAGE_SIZE);
-		physmem_map(ph_addr, *addr, 1,
-		    AS_AREA_READ | AS_AREA_CACHEABLE);
+		if (physmem_map(ph_addr, *addr, 1,
+		    AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
+			ipc_answer_0(callid, ENOENT);
+			return;
+		}
 	}
 	ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
@@ -151,10 +153,8 @@
 			switch (IPC_GET_ARG3(call)) {
 			case SERVICE_MEM_REALTIME:
-				get_as_area(callid, &call, "clock.faddr",
-				    &clockaddr);
+				get_as_area(callid, &call, "clock.faddr", &clockaddr);
 				break;
 			case SERVICE_MEM_KLOG:
-				get_as_area(callid, &call, "klog.faddr",
-				    &klogaddr);
+				get_as_area(callid, &call, "klog.faddr", &klogaddr);
 				break;
 			default:
Index: uspace/srv/rd/rd.c
===================================================================
--- uspace/srv/rd/rd.c	(revision fa094491c49be2130cd1f5bbad081181cbad82b1)
+++ uspace/srv/rd/rd.c	(revision 81c8d54932b8d433d80c1e2cc7f3bb31def15d79)
@@ -258,5 +258,5 @@
 	int retval = physmem_map(rd_ph_addr, rd_addr,
 	    ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
-
+	
 	if (retval < 0) {
 		printf(NAME ": Error mapping RAM disk\n");