diff --git a/app/com/linkedin/drelephant/util/SparkUtils.scala b/app/com/linkedin/drelephant/util/SparkUtils.scala
index e7efd9d8..aca9dc24 100644
--- a/app/com/linkedin/drelephant/util/SparkUtils.scala
+++ b/app/com/linkedin/drelephant/util/SparkUtils.scala
@@ -119,8 +119,11 @@ trait SparkUtils {
       }
       case None => {
         val (logPath, codecName) = getLogPathAndCodecName(fs, fs.getUri.resolve(basePath.toUri), appId)
-
-        (logPath, Some(compressionCodecMap.getOrElseUpdate(codecName, loadCompressionCodec(sparkConf, codecName))))
+        if(codecName == UNCOMPRESSED){
+          (logPath, None)
+        } else {
+          (logPath, Some(compressionCodecMap.getOrElseUpdate(codecName, loadCompressionCodec(sparkConf, codecName))))
+        }
       }
     }
 
@@ -181,6 +184,7 @@ trait SparkUtils {
 
   private val IN_PROGRESS = ".inprogress"
   private val DEFAULT_COMPRESSION_CODEC = "snappy"
+  private val UNCOMPRESSED = "uncompressed"
 
   private val compressionCodecClassNamesByShortName = Map(
     "lz4" -> classOf[LZ4CompressionCodec].getName,
@@ -227,14 +231,14 @@ trait SparkUtils {
     val nameAndExtension = logPath.split('.')
     if( nameAndExtension.length == 2 ) {
       extension = Some(nameAndExtension(1))
-      val name = nameAndExtension(0)
-      val appIdAndAttempt = name.split('_')
-      if( appIdAndAttempt.length == 4 ) {
-        attempt = Some(appIdAndAttempt(3))
-        appId = Some(appIdAndAttempt.dropRight(1).mkString("_"))
-      } else {
-        appId = Some(name)
-      }
+    }
+    val name = nameAndExtension(0)
+    val appIdAndAttempt = name.split('_')
+    if (appIdAndAttempt.length == 4) {
+      attempt = Some(appIdAndAttempt(3))
+      appId = Some(appIdAndAttempt.dropRight(1).mkString("_"))
+    } else {
+      appId = Some(name)
     }
     (appId, attempt, extension)
   }
@@ -272,7 +276,7 @@ trait SparkUtils {
                                                                 "_" + sanitize(finalAttempt._2.get) +
                                                                 "." + finalAttempt._3.get), finalAttempt._3.get)
       // if codec is not available, but we found a file match with appId, use the actual file Path from the first match
-      case nocodec if nocodec._1 != None & nocodec._3 == None => (attemptsList(0).getPath(), DEFAULT_COMPRESSION_CODEC)
+      case nocodec if nocodec._1 != None & nocodec._3 == None => (attemptsList(0).getPath(), UNCOMPRESSED)
 
       // This should be reached only if we can't parse the filename in the path.
       // Try to construct a general path in that case.