Added checks to methods in ContactManagerImpl