Added exception handling and more verbosity