anchor.diff:      Iface = dbus_message:find_field(?FIELD_INTERFACE, Hdr),
       Signal = dbus_message:find_field(?FIELD_MEMBER, Hdr),
       case find_handlers({Sender, Iface, Signal, Path}, [], Handlers) of
  -	[] ->
  -	    {noreply, State};
  -	Matches ->
  -	    F = fun (Handler, Acc) ->
  -			do_handle_signal(Handler, Acc, Sender, Iface, Signal, Path, Args)
  -		end,
  -	    Handlers2 = lists:foldl(F, [], Matches),
  -	    {noreply, State#state{handlers=Handlers2}}
  +		[] ->
  +			{noreply, State};
  +		Matches ->
  +			F = fun (Handler, Acc) ->
  +						do_handle_signal(Handler, Acc, Sender, Iface, Signal, Path, Args)
  +				end,
  +			Handlers2 = lists:foldl(F, [], Matches),
  +			{noreply, State#state{handlers=Handlers2}}
       end;
   handle_info({reply, #dbus_message{body=Body}, {tag, From, Options}}, State) ->
       reply(From, {ok, Body}, Options),
  
positive.code: 
  do_handle_signal(#signal_handler{mfa={Mod, Fun, Ctx}}=Handler, Acc, Sender, Iface, Signal, Path, Args) ->
      case erlang:function_exported(Mod, Fun, 6) of
  	true ->
  	    try Mod:Fun(Sender, Iface, Signal, Path, Args, Ctx)
  	    catch Cls:Err -> 
  		    ?error("Error dispatching signal to ~p:~p/6: ~p:~p", [Mod, Fun, Cls, Err])
  	    end,
  	    [ Handler | Acc ];
  	false -> Acc
      end;
  
  do_handle_signal(#signal_handler{mfa={Fun, Ctx}}=Handler, Acc, Sender, Iface, Signal, Path, Args) ->
      try Fun(Sender, Iface, Signal, Path, Args, Ctx)
      catch Cls:Err -> 
  	    ?error("Error dispatching signal to ~p/6: ~p:~p", [Fun, Cls, Err])
      end,
      [ Handler | Acc ];
  
  
negative.code: 	     {member, SignalName},
  	     {path, Path}],
      case do_method(?DBUS_IFACE, ?DBUS_DBUS_ADD_MATCH, [build_match(Match, <<>>)], State) of
  		{reply, ok, S2} -> 
  			Handler = #signal_handler{sender=Name, interface=IfaceName, member=SignalName, 
  									  path={Path, false}, mfa=MFA},	    
  			{reply, ok, S2#state{handlers=[ Handler | Handlers ]}};
  		{reply, {error, Err}, S2} -> {stop, {error, Err}, S2}
      end;
  
  handle_call({connect_signal, MFA}, _From, 
  