Adding part of exception handling