diff --git a/drivers/staging/android/ion/msm_ion_of.c b/drivers/staging/android/ion/msm_ion_of.c
index f9a3f207847a..58e86db16889 100644
--- a/drivers/staging/android/ion/msm_ion_of.c
+++ b/drivers/staging/android/ion/msm_ion_of.c
@@ -411,7 +411,7 @@ struct ion_heap *get_ion_heap(int heap_id)
 
 	for (i = 0; i < num_heaps; i++) {
 		heap = heaps[i];
-		if (heap->id == heap_id)
+		if (heap && heap->id == heap_id)
 			return heap;
 	}