MAINT decrease likelihood of heisen failure and get more informative message