diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Controllers.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Controllers.java
index eac151dee..7e6d1ebdd 100644
--- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Controllers.java
+++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/Controllers.java
@@ -19,8 +19,7 @@ public static int getControllerCount() {
     ctrlr.poll();
     }
     public static boolean next() {
-    ctrlr.poll();
-    return true;
+        return false;
     }
     public static boolean isCreated() {
     return true;
diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java
index 232e67138..d1fde8c94 100644
--- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java
+++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/opengl/Display.java
@@ -953,7 +953,7 @@ public class Display {
             } else {
                 glfwSetWindowIcon(Window.handle, new GLFWImage.Buffer(icons[0]));
             }
-        } catch (NullPointerException e) {
+        } catch (Exception e) {
             LWJGLUtil.log("Couldn't set icon");
             e.printStackTrace();
         }
@@ -986,8 +986,10 @@ public class Display {
     }
 
     public static void setDisplayModeAndFullscreen(DisplayMode dm) throws LWJGLException {
-        Display.mode = dm;
-        GLFW.glfwSetWindowSize(Window.handle, dm.getWidth(), dm.getHeight());
+        if(Window.handle != 0) {
+            Display.mode = dm;
+            GLFW.glfwSetWindowSize(Window.handle, dm.getWidth(), dm.getHeight());
+        }
     }
 
     public static void setFullscreen(boolean fullscreen) throws LWJGLException {