Improve assertion error support