Added more excpetion types