diff --git a/.gitignore b/.gitignore
index 47f7a9078d58d549d5c8e0c6d5762cdca54c0683..f1b1bb3710f9017f668a55162a60992d50fece2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,5 @@ doc
 /destdir/
 /bb1/
 /bb3/
+.idea
+cmake-build-debug
diff --git a/lib/core-net/pollfd.c b/lib/core-net/pollfd.c
index dea85aec0227054d4a13a681e2cfd8b2eb435c01..780e5e4545d5ff169bfa43fd7c2e35f73dd99006 100644
--- a/lib/core-net/pollfd.c
+++ b/lib/core-net/pollfd.c
@@ -523,7 +523,7 @@ lws_callback_on_writable(struct lws *wsi)
 {
 	struct lws *w = wsi;
 
-	if (lwsi_state(wsi) == LRS_SHUTDOWN)
+	if (wsi == NULL || lwsi_state(wsi) == LRS_SHUTDOWN)
 		return 0;
 
 	if (wsi->socket_is_permanently_unusable)