diff --git a/configure.ac b/configure.ac
index e7d05becd..a30d2721e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5501,6 +5501,12 @@ then
         AM_CFLAGS="$AM_CFLAGS -DSESSION_CERTS"
     fi
 
+    # Requires key gen make sure on
+    if test "x$ENABLED_KEYGEN" = "xno"
+    then
+        ENABLED_KEYGEN="yes"
+        AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"
+    fi
 fi
 
 if test "$ENABLED_NETSNMP" = "yes"
diff --git a/src/x509.c b/src/x509.c
index dc0756b6c..eaec2a2d8 100644
--- a/src/x509.c
+++ b/src/x509.c
@@ -10337,7 +10337,11 @@ cleanup:
 
         if ((l = wolfSSL_BIO_get_len(bp)) <= 0) {
             /* No certificate in buffer */
+#if defined (WOLFSSL_HAPROXY)
+            WOLFSSL_ERROR(PEM_R_NO_START_LINE);
+#else
             WOLFSSL_ERROR(ASN_NO_PEM_HEADER);
+#endif
             return NULL;
         }