Fixed iterator type
Inability to find the sockedt notifier is a fatal (internal) error
Added more assertions
Minor optimizations