SES-1808 : Add null checks for cases where the handler is not found