diff --git a/ape_buffer.c b/ape_buffer.c
index bce1007..4ee4f8e 100644
--- a/ape_buffer.c
+++ b/ape_buffer.c
@@ -69,16 +69,16 @@ static void zbuffer_prepapre_buf(buffer *b, size_t input_size)
         bufsize <<= 1;
     }
 
-    printf("zbuf prepared for size %ld\n", bufsize);
-
     b->zbuf->buf_size = bufsize;
 
     if (b->zbuf->buf) {
         b->zbuf->buf = realloc(b->zbuf->buf, bufsize);
-        printf("Realloc input buffer for size %ld\n", bufsize);
+        if (b->zbuf->buf == NULL) {
+            printf("Could not reallocate memory for zbuffer\n");
+            exit(1);
+        }
     } else {
         b->zbuf->buf = malloc(bufsize);
-        printf("Alloc input buffer for size %ld\n", bufsize);
     }
 
     b->zbuf->zstream.avail_out = bufsize - b->zbuf->zstream.avail_in;
@@ -229,6 +229,10 @@ void buffer_prepare(buffer *b, size_t size)
         }
         b->size += size;
         b->data = realloc(b->data, sizeof(char) * b->size);
+        if (b->data == NULL) {
+            printf("Could not reallocate memory for buffer\n");
+            exit(1);
+        }
     }
 #if APE_USE_ZLIB
     if (b->zbuf) {
@@ -249,6 +253,10 @@ static void buffer_prepare_for(buffer *b, size_t size, size_t forsize)
         }
         b->size += size;
         b->data = realloc(b->data, sizeof(char) * b->size);
+        if (b->data == NULL) {
+            printf("Could not reallocate memory for buffer\n");
+            exit(1);
+        }
     }
 #if APE_USE_ZLIB
     if (b->zbuf) {
@@ -399,6 +407,10 @@ buffer *buffer_to_buffer_utf8(buffer *b)
     if (newb->size > newb->used+1) {
         newb->size = newb->used+1;
         newb->data = realloc(newb->data, newb->size);
+        if (newb->data == NULL) {
+            printf("Could not reallocate memory for utf8 buffer\n");
+            exit(1);
+        }
     }
 
     return newb;
@@ -453,6 +465,10 @@ buffer *buffer_utf8_to_buffer(buffer *b)
     if (newb->size > newb->used+1) {
         newb->size = newb->used+1;
         newb->data = realloc(newb->data, newb->size);
+        if (newb->data == NULL) {
+            printf("Could not reallocate memory for utf8 buffer\n");
+            exit(1);
+        }
     }
 
     return newb;
diff --git a/ape_event_epoll.c b/ape_event_epoll.c
index 1bff69b..80899c8 100644
--- a/ape_event_epoll.c
+++ b/ape_event_epoll.c
@@ -101,6 +101,10 @@ static void event_epoll_setsize(struct _fdevent *ev, int size)
 {
     ev->events = realloc(ev->events,
             sizeof(struct epoll_event) * (size));
+    if (ev->events == NULL) {
+        printf("Could not reallocate memory for epoll\n");
+        exit(1);
+    }
 }
 
 static int event_epoll_revent(struct _fdevent *ev, int i)
diff --git a/ape_event_kqueue.c b/ape_event_kqueue.c
index be88906..12aba3b 100644
--- a/ape_event_kqueue.c
+++ b/ape_event_kqueue.c
@@ -105,6 +105,10 @@ static ape_event_descriptor *event_kqueue_get_evd(struct _fdevent *ev, int i)
 static void event_kqueue_setsize(struct _fdevent *ev, int size)
 {
 	ev->events = realloc(ev->events, sizeof(struct kevent) * (size * 2));
+	if (ev->events == NULL) {
+		printf("Could not reallocate memory for kqueue\n");
+		exit(1);
+	}
 }
 
 static int event_kqueue_revent(struct _fdevent *ev, int i)
diff --git a/ape_events.h b/ape_events.h
index 1b9f6d7..7c0c697 100644
--- a/ape_events.h
+++ b/ape_events.h
@@ -92,7 +92,7 @@ struct _fdevent {
     struct epoll_event *events;
     int epoll_fd;
 #elif defined USE_SELECT_HANDLER
-	struct select_fdinfo_t **events;       /* Pointers into fds */
+    struct select_fdinfo_t **events;       /* Pointers into fds */
     ape_htable_t *fdhash;
 #endif
     int basemem;                /* Number of elements in events */