Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 90f20cfd46bca7e15c5e858587268ccf5e1de029)
+++ kernel/generic/src/proc/task.c	(revision 6a32cc5f9f405da0c7afb110e787059cfec044b8)
@@ -207,4 +207,8 @@
 {
 	task_t *task = (task_t *) slab_alloc(task_cache, 0);
+	if (task == NULL) {
+		return NULL;
+	}
+	
 	task_create_arch(task);
 	
@@ -242,4 +246,11 @@
 	    (container_check(ipc_phone_0->task->container, task->container))) {
 		cap_handle_t phone_handle = phone_alloc(task);
+		if (phone_handle < 0) {
+			task->as = NULL;
+			task_destroy_arch(task);
+			slab_free(task_cache, task);
+			return NULL;
+		}
+		
 		kobject_t *phone_obj = kobject_get(task, phone_handle,
 		    KOBJECT_TYPE_PHONE);