Add some extra validation for experience saves
Merge branch 'feature/experienceSaving' into develop