Add some Exception catching