Error handling and Reachability functionality extended