Additional exception handling