Move the exception for easy removal later.

includes/tuque_wrapper.inc

@@ -239,7 +239,8 @@ class IslandoraFedoraObject extends FedoraObject {
       islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_INGESTED_HOOK, $object->models, $datastream->id, $object, $datastream);
       return $ret;
     }
-    catch (DatastreamExistsException $e) {
+    catch (Exception $e) {
+      if ($e instanceof DatastreamExistsException) {
         $message = islandora_deprecated('7.x-1.10', t('The datastream @dsid already exists on the object: @pid. After the 7.x-1.10 release this will throw an exception.', array(
           '@dsid' => $datastream->id,
           '@pid' => $object->id,
@@ -247,7 +248,6 @@ class IslandoraFedoraObject extends FedoraObject {
         trigger_error(filter_xss($message), E_USER_DEPRECATED);
         return FALSE;
       }
-    catch (Exception $e) {
       watchdog('islandora', 'Failed to ingest datastream @dsid on object: @pid</br>code: @code<br/>message: @msg', array(
         '@pid' => $object->id,
         '@dsid' => $datastream->id,