added more exceptions to API file