diff --git a/xvidtune.c b/xvidtune.c
index 2f73bf1..909710c 100644
--- a/xvidtune.c
+++ b/xvidtune.c
@@ -1529,12 +1529,10 @@ main (int argc, char** argv)
 
     if (!XF86VidModeQueryVersion(XtDisplay (top), &MajorVersion, &MinorVersion)) {
 	fprintf(stderr, "Unable to query video extension version\n");
-	return 2;
     }
 
     if (!XF86VidModeQueryExtension(XtDisplay (top), &EventBase, &ErrorBase)) {
 	fprintf(stderr, "Unable to query video extension information\n");
-	return 2;
     }
 
     /* Fail if the extension version in the server is too old */
@@ -1545,7 +1543,6 @@ main (int argc, char** argv)
 		" (%d.%d)\n", MajorVersion, MinorVersion);
 	fprintf(stderr, "Minimum required version is %d.%d\n",
 		MINMAJOR, MINMINOR);
-	exit(2);
     }
  
     /* This should probably be done differently */
@@ -1566,8 +1563,6 @@ main (int argc, char** argv)
 	if (!strcmp(argv[1], "-show")) {
 	  if (!GetModeLine(XtDisplay (top), DefaultScreen (XtDisplay (top)))) {
 	    fprintf(stderr, "Unable to get mode info\n");
-	    CleanUp(XtDisplay (top));
-	    return 2;
 	  }
 	  ShowCB(top, NULL, NULL);
 	  return 0;
@@ -1590,13 +1585,11 @@ main (int argc, char** argv)
     }
     if (!GetMonitor(XtDisplay (top), DefaultScreen (XtDisplay (top)))) {
 	fprintf(stderr, "Unable to query monitor info\n");
-	return 2;
     }
 
     if (!XF86VidModeLockModeSwitch(XtDisplay (top),
 				   DefaultScreen (XtDisplay (top)), TRUE)) {
 	fprintf(stderr, "Failed to disable mode-switch hot-keys\n");
-	return 2;
     }
 
     signal(SIGINT, CatchSig);
@@ -1607,8 +1600,6 @@ main (int argc, char** argv)
 
     if (!GetModeLine(XtDisplay (top), DefaultScreen (XtDisplay (top)))) {
 	fprintf(stderr, "Unable to get mode info\n");
-	CleanUp(XtDisplay (top));
-	return 2;
     }
 
     xtErrorfunc = XSetErrorHandler(vidmodeError); 
@@ -1633,11 +1624,6 @@ main (int argc, char** argv)
 	<FocusIn>: focus-in()\n<FocusOut>: focus-out()\n\
 	<Btn1Down>: select-start()\n");
 
-    if (!ModeSettable()) {
-	printf("Video modes are not settable on this chip\n");
-	displayNoTune(top);
-	modeSettable = FALSE;
-    } else
 	CreateHierarchy (top);
     
 
