diff --git a/build.properties b/build.properties
index 678a6d7cb..904bf5198 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 minecraft.version=1.7.2
 forge.version=10.12.1.1061
-oc.version=1.2.9
+oc.version=1.2.10
 ccl.version=1.0.0.62
 fmp.version=1.0.0.250
 maven.url=file:///var/www/users/fnuecke/maven.cil.li
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/server/component/machine/Machine.scala b/src/main/scala/li/cil/oc/server/component/machine/Machine.scala
index ed354ede0..08218cb99 100644
--- a/src/main/scala/li/cil/oc/server/component/machine/Machine.scala
+++ b/src/main/scala/li/cil/oc/server/component/machine/Machine.scala
@@ -193,6 +193,10 @@ class Machine(val owner: Owner, val rom: Option[ManagedEnvironment], constructor
     case Machine.State.Stopped | Machine.State.Stopping => false
     case _ => signals.synchronized {
       if (signals.size >= 256) false
+      else if (args == null) {
+        signals.enqueue(new Machine.Signal(name, Array.empty))
+        true
+      }
       else {
         signals.enqueue(new Machine.Signal(name, args.map {
           case null | Unit | None => null