Made compatible with both Hydro and Indigo
Fix error messages