#23 Improved message for case body