Add some extra checks...