Preventing listner from stoping commit
Removal of bennu-legacy
Adding adicional lockless error handlers
Preventing NPE