diff --git a/homeassistant/components/neato.py b/homeassistant/components/neato.py
index 6c5fac074ba..c6ab06d6884 100644
--- a/homeassistant/components/neato.py
+++ b/homeassistant/components/neato.py
@@ -56,25 +56,68 @@ ACTION = {
 }
 
 ERRORS = {
+    'ui_error_battery_battundervoltlithiumsafety': 'Replace battery',
+    'ui_error_battery_critical': 'Replace battery',
+    'ui_error_battery_invalidsensor': 'Replace battery',
+    'ui_error_battery_lithiumadapterfailure': 'Replace battery',
+    'ui_error_battery_mismatch': 'Replace battery',
+    'ui_error_battery_nothermistor': 'Replace battery',
+    'ui_error_battery_overtemp': 'Replace battery',
+    'ui_error_battery_undercurrent': 'Replace battery',
+    'ui_error_battery_undertemp': 'Replace battery',
+    'ui_error_battery_undervolt': 'Replace battery',
+    'ui_error_battery_unplugged': 'Replace battery',
     'ui_error_brush_stuck': 'Brush stuck',
     'ui_error_brush_overloaded': 'Brush overloaded',
     'ui_error_bumper_stuck': 'Bumper stuck',
+    'ui_error_check_battery_switch': 'Check battery',
+    'ui_error_corrupt_scb': 'Call customer service corrupt board',
+    'ui_error_deck_debris': 'Deck debris',
     'ui_error_dust_bin_missing': 'Dust bin missing',
     'ui_error_dust_bin_full': 'Dust bin full',
     'ui_error_dust_bin_emptied': 'Dust bin emptied',
+    'ui_error_hardware_failure': 'Hardware failure',
+    'ui_error_ldrop_stuck': 'Clear my path',
+    'ui_error_lwheel_stuck': 'Clear my path',
+    'ui_error_navigation_backdrop_frontbump': 'Clear my path',
     'ui_error_navigation_backdrop_leftbump': 'Clear my path',
+    'ui_error_navigation_backdrop_wheelextended': 'Clear my path',
     'ui_error_navigation_noprogress': 'Clear my path',
     'ui_error_navigation_origin_unclean': 'Clear my path',
     'ui_error_navigation_pathproblems_returninghome': 'Cannot return to base',
     'ui_error_navigation_falling': 'Clear my path',
+    'ui_error_navigation_noexitstogo': 'Clear my path',
+    'ui_error_navigation_nomotioncommands': 'Clear my path',
+    'ui_error_navigation_rightdrop_leftbump': 'Clear my path',
+    'ui_error_navigation_undockingfailed': 'Clear my path',
     'ui_error_picked_up': 'Picked up',
+    'ui_error_rdrop_stuck': 'Clear my path',
+    'ui_error_rwheel_stuck': 'Clear my path',
     'ui_error_stuck': 'Stuck!',
+    'ui_error_unable_to_see': 'Clean vacuum sensors',
+    'ui_error_vacuum_slip': 'Clear my path',
+    'ui_error_vacuum_stuck': 'Clear my path',
+    'ui_error_warning': 'Error check app',
+    'batt_base_connect_fail': 'Battery failed to connect to base',
+    'batt_base_no_power': 'Battery base has no power',
+    'batt_low': 'Battery low',
+    'batt_on_base': 'Battery on base',
+    'clean_tilt_on_start': 'Clean the tilt on start',
     'dustbin_full': 'Dust bin full',
     'dustbin_missing': 'Dust bin missing',
+    'gen_picked_up': 'Picked up',
+    'hw_fail': 'Hardware failure',
+    'hw_tof_sensor_sensor': 'Hardware sensor disconnected',
+    'lds_bad_packets': 'Bad packets',
+    'lds_deck_debris': 'Debris on deck',
+    'lds_disconnected': 'Disconnected',
+    'lds_jammed': 'Jammed',
     'maint_brush_stuck': 'Brush stuck',
     'maint_brush_overload': 'Brush overloaded',
     'maint_bumper_stuck': 'Bumper stuck',
+    'maint_customer_support_qa': 'Contact customer support',
     'maint_vacuum_stuck': 'Vacuum is stuck',
+    'maint_vacuum_slip': 'Vacuum is stuck',
     'maint_left_drop_stuck': 'Vacuum is stuck',
     'maint_left_wheel_stuck': 'Vacuum is stuck',
     'maint_right_drop_stuck': 'Vacuum is stuck',
@@ -82,7 +125,15 @@ ERRORS = {
     'not_on_charge_base': 'Not on the charge base',
     'nav_robot_falling': 'Clear my path',
     'nav_no_path': 'Clear my path',
-    'nav_path_problem': 'Clear my path'
+    'nav_path_problem': 'Clear my path',
+    'nav_backdrop_frontbump': 'Clear my path',
+    'nav_backdrop_leftbump': 'Clear my path',
+    'nav_backdrop_wheelextended': 'Clear my path',
+    'nav_mag_sensor': 'Clear my path',
+    'nav_no_exit': 'Clear my path',
+    'nav_no_movement': 'Clear my path',
+    'nav_rightdrop_leftbump': 'Clear my path',
+    'nav_undocking_failed': 'Clear my path'
 }
 
 ALERTS = {