Better error handling + Updater 2.3