Improve assertion failure message again