Changed the handler name method to be what it really is.
Don't log, actually try to pop.
Handle the remove calls.