diff --git a/src/bio.c b/src/bio.c
index df715f9cc..91c5c809c 100644
--- a/src/bio.c
+++ b/src/bio.c
@@ -557,7 +557,7 @@ int wolfSSL_BIO_gets(WOLFSSL_BIO* bio, char* buf, int sz)
     switch (bio->type) {
 #ifndef NO_FILESYSTEM
         case WOLFSSL_BIO_FILE:
-            if (bio->file == NULL) {
+            if (bio->file == XBADFILE) {
                 return WOLFSSL_BIO_ERROR;
             }
 
@@ -1068,8 +1068,7 @@ long wolfSSL_BIO_set_fp(WOLFSSL_BIO *bio, XFILE fp, int c)
 {
     WOLFSSL_ENTER("wolfSSL_BIO_set_fp");
 
-    if (bio == NULL || fp == XBADFILE)
-    {
+    if (bio == NULL || fp == XBADFILE) {
         WOLFSSL_LEAVE("wolfSSL_BIO_set_fp", BAD_FUNC_ARG);
         return WOLFSSL_FAILURE;
     }
@@ -1089,7 +1088,7 @@ long wolfSSL_BIO_get_fp(WOLFSSL_BIO *bio, XFILE* fp)
 {
     WOLFSSL_ENTER("wolfSSL_BIO_get_fp");
 
-    if (bio == NULL || fp == NULL) {
+    if (bio == NULL || fp == XBADFILE) {
         return WOLFSSL_FAILURE;
     }
 
@@ -1112,7 +1111,7 @@ int wolfSSL_BIO_write_filename(WOLFSSL_BIO *bio, char *name)
     }
 
     if (bio->type == WOLFSSL_BIO_FILE) {
-        if (bio->file != NULL && bio->close == BIO_CLOSE) {
+        if (bio->file != XBADFILE && bio->close == BIO_CLOSE) {
             XFCLOSE(bio->file);
         }
 
diff --git a/tests/api.c b/tests/api.c
index 343a926b8..8120ee9e2 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -14669,7 +14669,7 @@ static void test_wc_PKCS7_InitWithCert (void)
         AssertTrue(fp != XBADFILE);
 
         certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
-        XCLOSE(fp);
+        XFCLOSE(fp);
     #endif
 #else
         #error PKCS7 requires ECC or RSA
@@ -14739,7 +14739,7 @@ static void test_wc_PKCS7_EncodeData (void)
         certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
         XFCLOSE(fp);
 
-        fp = XOPEN("./certs/1024/client-key.der", "rb");
+        fp = XFOPEN("./certs/1024/client-key.der", "rb");
         AssertTrue(fp != XBADFILE);
         keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp);
         XFCLOSE(fp);
@@ -14840,7 +14840,7 @@ static void test_wc_PKCS7_EncodeSignedData(void)
         int             certSz;
         int             keySz;
 
-        fp = XOPEN("./certs/1024/client-cert.der", "rb");
+        fp = XFOPEN("./certs/1024/client-cert.der", "rb");
         AssertTrue(fp != XBADFILE);
         certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
         XFCLOSE(fp);