--- a/libparted/libparted.c
+++ b/libparted/libparted.c
@@ -255,6 +255,8 @@ void* ped_calloc (size_t size)
 {
         void* buf = ped_malloc (size);
 
+        if (buf == NULL)
+                return NULL;
         memset (buf, 0, size);
 
         return buf;