more assert error message cleanup