diff --git a/akka-core/src/main/scala/config/Config.scala b/akka-core/src/main/scala/config/Config.scala
index 0b492ec8fa..34b2402d08 100644
--- a/akka-core/src/main/scala/config/Config.scala
+++ b/akka-core/src/main/scala/config/Config.scala
@@ -43,7 +43,7 @@ object Config extends Logging {
           "\n\tdue to: " + e.toString)
       }
       Configgy.config
-    } else if (getClass.getClassLoader.getResource("akka.conf") != null) {
+    } else if (getClass.getClassLoader.getResource("/akka.conf") != null) {
       try {
         Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
         log.info("Config loaded from the application classpath.")
@@ -74,7 +74,7 @@ object Config extends Logging {
         "\n\t3. Define 'AKKA_HOME' environment variable pointing to the root of the Akka distribution." +
         "\nI have no way of finding the 'akka.conf' configuration file." +
         "\nUsing default values everywhere.")
-      CConfig.fromString("<akka></akka>")
+      CConfig.fromString("<akka></akka>") // default empty config
     }
   }