Fixed null execption for non existing users and removed unwanted end points