Error will show up when you try to replace handler in session interface.

Little clean up again.