+ Added setting timeouts and check for NPE