Added debug out put and more robust code..?
Need to use the same instance we registered the event handler on!