Fixed spelling mistake.
Renamed variable h to handler.
There is no need of "if" : just return the result.
Revert "The constructor with the tenantId does not exist anymore."

This reverts commit df5c28a5db8f6b686f7cfb4968daa77192aa3614.