Even simpler error handling for auto-refresh

Change-Id: I7a646eb16926b4aad249854bd7770ec1cd2a8d6c