Working on updating the assertion/exception code.