add check for Handlers