Added noRaise handler to preven tcrash in prod.