diff --git a/fuzz-wrapfd.c b/fuzz-wrapfd.c
index 215eb166ddd22392f307dc32f25ca6afa909148b..c65ed38d252e626cd7e3125b743f226e74ef44a0 100644
--- a/fuzz-wrapfd.c
+++ b/fuzz-wrapfd.c
@@ -44,7 +44,6 @@ void wrapfd_add(int fd, buffer *buf, enum wrapfd_mode mode) {
 	assert(wrap_fds[fd].mode == UNUSED);
 	assert(buf || mode == RANDOMIN);
 
-
 	wrap_fds[fd].mode = mode;
 	wrap_fds[fd].buf = buf;
 	wrap_fds[fd].closein = 0;
@@ -73,8 +72,15 @@ void wrapfd_remove(int fd) {
 	nused--;
 }
 
-void wrapfd_close(int fd) {
-	wrapfd_remove(fd);
+int wrapfd_close(int fd) {
+	if (fd >= 0 && fd <= IOWRAP_MAXFD && wrap_fds[fd].mode != UNUSED) 
+	{
+		wrapfd_remove(fd);
+		return 0;
+	}
+	else {
+		return close(fd);
+	}
 }
 
 int wrapfd_read(int fd, void *out, size_t count) {
diff --git a/fuzz-wrapfd.h b/fuzz-wrapfd.h
index a73a7fe24bb546f2670e50656e139fe2f8e585c5..9358c1a4b8cd9e509904dcfcaeb54985bdd58c55 100644
--- a/fuzz-wrapfd.h
+++ b/fuzz-wrapfd.h
@@ -19,5 +19,6 @@ int wrapfd_read(int fd, void *out, size_t count);
 int wrapfd_write(int fd, const void* in, size_t count);
 int wrapfd_select(int nfds, fd_set *readfds, fd_set *writefds, 
     fd_set *exceptfds, struct timeval *timeout);
+int wrapfd_close(int fd);
 
 #endif // FUZZ_WRAPFD_H