Refactored failure message again