[TIMOB-13279] Cleaned up some error messages