change to not cause issue when trying to unregister handlers if they are null
fix tests for new requirements