diff --git a/core/display.js b/core/display.js
index 1e197bd9..9069fa7f 100644
--- a/core/display.js
+++ b/core/display.js
@@ -410,10 +410,14 @@ export default class Display {
     }
 
     drawImage(img, x, y, w, h) {
-	if (img.width != w || img.height != h) {
-            this._drawCtx.drawImage(img, x, y, w, h);
-        } else {
-            this._drawCtx.drawImage(img, x, y);
+        try {
+	    if (img.width != w || img.height != h) {
+                this._drawCtx.drawImage(img, x, y, w, h);
+            } else {
+                this._drawCtx.drawImage(img, x, y);
+            }
+        } catch (error) {
+            Log.Error('Invalid image recieved.'); //KASM-2090
         }
         this._damage(x, y, w, h);
     }
diff --git a/vnc.html b/vnc.html
index d55537b9..4025bb6b 100644
--- a/vnc.html
+++ b/vnc.html
@@ -245,16 +245,6 @@
                                     <option value=2>Off</option>
                                 </select>
                             </li>
-                            <li>
-                                <label for="noVNC_setting_jpeg_video_quality">JPEG Quality:</label>
-                                <input id="noVNC_setting_jpeg_video_quality" type="range" min="0" max="9" value="5" onchange="noVNC_setting_jpeg_video_quality_output.value=value">
-                                <output id="noVNC_setting_jpeg_video_quality_output">5</output>
-                            </li>
-                            <li>
-                                <label for="noVNC_setting_webp_video_quality">WEBP Quality:</label>
-                                <input id="noVNC_setting_webp_video_quality" type="range" min="0" max="9" value="5" onchange="noVNC_setting_webp_video_quality_output.value=value">
-                                <output id="noVNC_setting_webp_video_quality_output">5</output>
-                            </li>
                             <li style="display: none;">
                                 <label for="noVNC_setting_quality">Quality:</label>
                                 <input id="noVNC_setting_quality" type="range" min="0" max="9" value="6">
@@ -280,6 +270,16 @@
                                 <input id="noVNC_setting_framerate" type="number" min="1" max="120" value="30">
                             </li>
                             <li>
+                                <label for="noVNC_setting_jpeg_video_quality">Video JPEG Quality:</label>
+                                <input id="noVNC_setting_jpeg_video_quality" type="range" min="0" max="9" value="5" onchange="noVNC_setting_jpeg_video_quality_output.value=value">
+                                <output id="noVNC_setting_jpeg_video_quality_output">5</output>
+                            </li>
+                            <li>
+                                <label for="noVNC_setting_webp_video_quality">Video WEBP Quality:</label>
+                                <input id="noVNC_setting_webp_video_quality" type="range" min="0" max="9" value="5" onchange="noVNC_setting_webp_video_quality_output.value=value">
+                                <output id="noVNC_setting_webp_video_quality_output">5</output>
+                            </li>
+			    <li>
                                 <label for="noVNC_setting_video_area">Video Area:</label>
                                 <input id="noVNC_setting_video_area" type="range" min="0" max="100" value="65" onchange="noVNC_setting_video_area_output.value=value">
                                 <output id="noVNC_setting_video_area_output">65</output>
@@ -457,4 +457,4 @@
         <div class="button keyboard handle"></div>
     </div>
  </body>
-</html>
\ No newline at end of file
+</html>