adding exceptions to DataService