Add extra assertion guard