Added check in services for invalid data