Fix handler object

Create the new handler only if handler is not already an object