diff --git a/libretro-common/formats/png/rpng_nbio.c b/libretro-common/formats/png/rpng_nbio.c
index 98564a52f6..f1e5ba5c84 100644
--- a/libretro-common/formats/png/rpng_nbio.c
+++ b/libretro-common/formats/png/rpng_nbio.c
@@ -375,13 +375,10 @@ struct rpng_t *rpng_nbio_load_image_argb_init(const char *path)
    return rpng;
 
 error:
+   if (rpng->userdata)
+      nbio_free((struct nbio_t*)rpng->userdata);
    if (rpng)
-   {
-      rpng->userdata = NULL;
       free(rpng);
-   }
-   if (nbread)
-      nbio_free(nbread);
    return NULL;
 }