Enhancement on assert