--- p5_pbev2.c.orig	2016-03-06 17:21:56.612223544 -0800
+++ p5_pbev2.c	2016-03-06 17:23:25.049463462 -0800
@@ -105,6 +105,8 @@
         goto err;
     }
     obj = OBJ_nid2obj(alg_nid);
+    if (obj == NULL)
+	goto merr;
 
     if (!(pbe2 = PBE2PARAM_new()))
         goto merr;
@@ -169,6 +171,8 @@
         goto merr;
 
     ret->algorithm = OBJ_nid2obj(NID_pbes2);
+    if (ret->algorithm == NULL)
+	goto merr;
 
     /* Encode PBE2PARAM into parameter */
 
@@ -258,6 +262,8 @@
         goto merr;
 
     keyfunc->algorithm = OBJ_nid2obj(NID_id_pbkdf2);
+    if (!keyfunc->algorithm)
+	goto merr;
 
     /* Encode PBKDF2PARAM into parameter of pbe2 */