diff --git a/core/src/main/scala/spark/BitTorrentBroadcast.scala b/core/src/main/scala/spark/BitTorrentBroadcast.scala
index 2f5d063438fc5afe46f35597bde54e1b8b7737da..dba9d39abfae7b49b1ee604fd76cd31de264643d 100644
--- a/core/src/main/scala/spark/BitTorrentBroadcast.scala
+++ b/core/src/main/scala/spark/BitTorrentBroadcast.scala
@@ -1079,6 +1079,9 @@ extends Logging {
   def initialize (isMaster__ : Boolean): Unit = {
     synchronized {
       if (!initialized) {
+        // Fix for issue #42
+        MasterHostAddress_ =
+          System.getProperty ("spark.broadcast.masterHostAddress", "")
         MasterTrackerPort_ = 
           System.getProperty ("spark.broadcast.masterTrackerPort", "11111").toInt
         BlockSize_ = 
diff --git a/core/src/main/scala/spark/ChainedBroadcast.scala b/core/src/main/scala/spark/ChainedBroadcast.scala
index 63c79c693e23d7457ad81858f28fa4a9031f7ad6..8021f5da068a81d0e186661a68a6dfbf1062617c 100644
--- a/core/src/main/scala/spark/ChainedBroadcast.scala
+++ b/core/src/main/scala/spark/ChainedBroadcast.scala
@@ -745,6 +745,9 @@ extends Logging {
   def initialize (isMaster__ : Boolean): Unit = {
     synchronized {
       if (!initialized) {
+        // Fix for issue #42
+        MasterHostAddress_ =
+          System.getProperty ("spark.broadcast.masterHostAddress", "")
         MasterTrackerPort_ = 
           System.getProperty ("spark.broadcast.masterTrackerPort", "22222").toInt
         BlockSize_ = 
diff --git a/core/src/main/scala/spark/MesosScheduler.scala b/core/src/main/scala/spark/MesosScheduler.scala
index c081ccff53afa4322617132d24a9a99ec651f91a..d635e95dbaed274a22747980ec17fafd50d6b7bb 100644
--- a/core/src/main/scala/spark/MesosScheduler.scala
+++ b/core/src/main/scala/spark/MesosScheduler.scala
@@ -253,9 +253,11 @@ extends MScheduler with DAGScheduler with Logging
     // Copy each JAR to a unique filename in the jarDir
     for ((path, index) <- sc.jars.zipWithIndex) {
       val file = new File(path)
-      val filename = index + "_" + file.getName
-      copyFile(file, new File(jarDir, filename))
-      filenames += filename
+      if (file.exists) {
+        val filename = index + "_" + file.getName
+        copyFile(file, new File(jarDir, filename))
+        filenames += filename
+      }
     }
     // Create the server
     jarServer = new HttpServer(jarDir)