Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java	(revision 767)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java	(revision 772)
@@ -22,20 +22,15 @@
 			case LINUX:
 				exe = new File(Paths.getEditionBasePath(), "Oni.exe");
-				if (exe.exists())
-					return exe;
-				else
-					throw new FileNotFoundException(
-							"Oni's executable was not found");
+				break;
 			case MACOS:
 				exe = new File("./Oni.app/Contents/MacOS/Oni");
-				if (new File(Paths.getEditionBasePath(),
-						"Oni.app/Contents/MacOS/Oni").exists())
-					return exe;
-				else
-					throw new FileNotFoundException(
-							"Oni's executable was not found");
+				break;
 			default:
 		}
-		return null;
+		if (exe.exists())
+			return exe;
+		else
+			throw new FileNotFoundException(
+					"Oni's executable was not found");
 	}