cleanup some assert() with error propagation

cleanup some assert() with error propagation #2676