Fixed empty city bugs, added error messages