Added Klaus' fix for accidental DOM node catches (Ticket #3).