Fix #316 Add extra validation to History Behaviour