diff --git a/src/main/java/net/minecraftforge/launcher/DownloadAssets.java b/src/main/java/net/minecraftforge/launcher/DownloadAssets.java
index b0a94d9..4bcff2b 100644
--- a/src/main/java/net/minecraftforge/launcher/DownloadAssets.java
+++ b/src/main/java/net/minecraftforge/launcher/DownloadAssets.java
@@ -34,9 +34,10 @@ static void download(String repo, File assetsDir, MinecraftVersion versionJson)
             AssetsIndex.Asset asset = entry.getValue();
             String assetDest = getAssetDest(asset.hash);
             File file = new File(objectsDir, assetDest);
-            if (file.exists()) {
-                Main.LOGGER.debug("Considering existing file with size " + file.length() + " for " + name);
-                if (file.length() == asset.size) {
+            long fileLength = file.length();
+            if (fileLength != 0) {
+                Main.LOGGER.debug("Considering existing file with size " + fileLength + " for " + name);
+                if (fileLength == asset.size) {
                     Main.LOGGER.debug("Size check succeeded. Skipping.");
                     continue;
                 }
@@ -64,9 +65,8 @@ private static String getAssetDest(String hash) {
 
     private static File downloadIndex(MinecraftVersion versionJson, File assetsDir) {
         File index = new File(assetsDir, "indexes/" + versionJson.assetIndex.id + ".json");
-        if (index.exists() && index.length() == versionJson.assetIndex.size) {
+        if (index.length() == versionJson.assetIndex.size)
             return index;
-        }
 
         if (!index.getParentFile().getAbsoluteFile().exists() && !index.getParentFile().getAbsoluteFile().mkdirs())
             throw new IllegalArgumentException("Failed to create index directory: " + index.getParentFile());
diff --git a/src/main/java/net/minecraftforge/launcher/Main.java b/src/main/java/net/minecraftforge/launcher/Main.java
index 45cef0c..105c856 100644
--- a/src/main/java/net/minecraftforge/launcher/Main.java
+++ b/src/main/java/net/minecraftforge/launcher/Main.java
@@ -161,7 +161,7 @@ private SplitArgs(String[] args) {
             // we're looking for the first "--"
             int splitIdx = -1;
             for (int i = 0; i < args.length; i++) {
-                if (args[i].equals("--")) {
+                if ("--".equals(args[i])) {
                     splitIdx = i;
                     break;
                 }