removed unnecessary checking when history is disabled
added retry for Initialize()