activity error handeling & bug fixes