diff --git a/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/RelatedIDs.php b/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/RelatedIDs.php
index 574946815a2fa6200fdcaacbd5539536234aac9f..b8ba9e9d45cbdbf242e9a68eb498a78c07269c92 100644
--- a/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/RelatedIDs.php
+++ b/modules/salesforce_mapping/src/Plugin/SalesforceMappingField/RelatedIDs.php
@@ -89,10 +89,19 @@ class RelatedIDs extends SalesforceMappingFieldPluginBase {
     }
 
     $value = $sf_object->field($this->config('salesforce_field'));
+    // Empty value means nothing to do here.
+    if (empty($value)) {
+      return NULL;
+    }
 
     // If value is not an SFID, make it one.
     if (!($value instanceof SFID)) {
-      $value = new SFID($value);
+      try {
+        $value = new SFID($value);
+      }
+      catch (\Exception $e) {
+        return NULL;
+      }
     }
 
     // Convert SF Id to Drupal Id.
diff --git a/src/Rest/RestClient.php b/src/Rest/RestClient.php
index 264cc99910fd125b03b51a94f7aee2de1c672499..d76c1fa321bacade0972efed262d8c8aaa74a787 100644
--- a/src/Rest/RestClient.php
+++ b/src/Rest/RestClient.php
@@ -205,6 +205,25 @@ class RestClient implements RestClientInterface {
     return $this->httpRequest($url, $data, $headers, $method);
   }
 
+  /**
+   * Return raw response content from given URL. Useful for fetching data from
+   * binary fields like Attachments.
+   *
+   * @param string $url
+   * @return mixed
+   */
+  public function httpRequestRaw($url) {
+    if (!$this->getAccessToken()) {
+      throw new \Exception('Missing OAuth Token');
+    }
+    $headers = [
+      'Authorization' => 'OAuth ' . $this->getAccessToken(),
+      'Content-type' => 'application/json',
+    ];
+    $response = $this->httpRequest($url, NULL, $headers);
+    return $response->getBody()->getContents();
+  }
+
   /**
    * Make the HTTP request. Wrapper around drupal_http_request().
    *