diff --git a/akka-actor/src/main/scala/akka/event/EventHandler.scala b/akka-actor/src/main/scala/akka/event/EventHandler.scala
index 5b8245d1d4..3fd2f02be5 100644
--- a/akka-actor/src/main/scala/akka/event/EventHandler.scala
+++ b/akka-actor/src/main/scala/akka/event/EventHandler.scala
@@ -165,10 +165,14 @@ object EventHandler extends ListenerManagement {
     }
   }
 
-  config.getList("akka.event-handlers") foreach { listenerName =>
+  val defaultListeners = config.getList("akka.event-handlers") match {
+    case Nil       => "akka.event.EventHandler$DefaultListener" :: Nil
+    case listeners => listeners
+  }
+  defaultListeners foreach { listenerName =>
     try {
-      ReflectiveAccess.getClassFor[Actor](listenerName) map {
-        clazz => addListener(Actor.actorOf(clazz).start)
+      ReflectiveAccess.getClassFor[Actor](listenerName) map { clazz =>
+        addListener(Actor.actorOf(clazz).start)
       }
     } catch {
       case e: Exception =>
diff --git a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
index 2733159445..d644518431 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
@@ -56,7 +56,7 @@ object Pi extends App {
   // ==================
   // ===== Worker =====
   // ==================
-  class Worker() extends Actor {
+  class Worker extends Actor {
     // define the work
 
 /*