More generic fix that handles None for retry_timeout