Completed assert related changes.<see#137>T:1h