Changes made, because of rename of class & added catch clauses for not
being able to connect to device