Fix readtimeout handling and check name before updating