Added specific exceptions to improve Exception Handling