The Berrics - Add some extra checks