improved the error reporting of several more assertions