diff --git a/modules/builddmrpp_module/NgapBuildDmrppContainer.cc b/modules/builddmrpp_module/NgapBuildDmrppContainer.cc
index 86c5f97b79..96ff4f8dc6 100644
--- a/modules/builddmrpp_module/NgapBuildDmrppContainer.cc
+++ b/modules/builddmrpp_module/NgapBuildDmrppContainer.cc
@@ -94,11 +94,11 @@ void NgapBuildDmrppContainer::initialize()
 }
 
 NgapBuildDmrppContainer::NgapBuildDmrppContainer(const NgapBuildDmrppContainer &copy_from) :
-        BESContainer(copy_from), d_data_rresource(copy_from.d_data_rresource), d_real_name(copy_from.d_real_name) {
+        BESContainer(copy_from), d_real_name(copy_from.d_real_name) {
 
     BESDEBUG(MODULE, prolog << "BEGIN   object address: "<< (void *) this << " Copying from: " << (void *) &copy_from << endl);
     // We can not make a copy of this container once the request has been made.
-    if (d_data_rresource) {
+    if (copy_from.d_data_rresource) {
         throw BESInternalError("The Container has already been accessed, cannot create a copy of this container.",
                                __FILE__, __LINE__);
     }
@@ -113,14 +113,15 @@ void NgapBuildDmrppContainer::_duplicate(NgapBuildDmrppContainer &copy_to) {
     BESDEBUG(MODULE, prolog << "BEGIN   object address: "<< (void *) this << " Copying to: " << (void *) &copy_to << endl);
 
     if (copy_to.d_data_rresource) {
-        throw BESInternalError("The Container has already been accessed, cannot duplicate this resource.",
+        throw BESInternalError("The target Container has already been accessed, "
+                               "cannot duplicate this resource into it.",
                                __FILE__, __LINE__);
     }
 
     BESContainer::_duplicate(copy_to);
 
     copy_to.d_real_name = d_real_name;
-    copy_to.d_data_rresource = d_data_rresource;
+    copy_to.d_data_rresource = std::move(d_data_rresource);
 }
 
 BESContainer *
@@ -159,7 +160,7 @@ string NgapBuildDmrppContainer::access() {
 
         auto data_url(std::make_shared<http::url>(data_access_url_str, true));
         {
-            d_data_rresource = std::make_shared<http::RemoteResource>(data_url);
+            d_data_rresource = std::make_unique<http::RemoteResource>(data_url);
 #ifndef NDEBUG
             BESStopWatch besTimer;
             if (BESISDEBUG(MODULE) || BESDebug::IsSet(TIMING_LOG_KEY) || BESLog::TheLog()->is_verbose()) {
diff --git a/modules/builddmrpp_module/NgapBuildDmrppContainer.h b/modules/builddmrpp_module/NgapBuildDmrppContainer.h
index 861429a6c3..5f2097af3f 100644
--- a/modules/builddmrpp_module/NgapBuildDmrppContainer.h
+++ b/modules/builddmrpp_module/NgapBuildDmrppContainer.h
@@ -52,7 +52,7 @@ namespace builddmrpp {
 class NgapBuildDmrppContainer : public BESContainer {
 
 private:
-    std::shared_ptr<http::RemoteResource> d_data_rresource = nullptr;
+    std::unique_ptr<http::RemoteResource> d_data_rresource = nullptr;
     std::string d_real_name;         ///< The full name of the thing (filename, database table name, ...)
 
     void initialize();
diff --git a/modules/builddmrpp_module/NgapBuildDmrppContainerStorage.cc b/modules/builddmrpp_module/NgapBuildDmrppContainerStorage.cc
index 1ef57ac74b..a0cc69af05 100644
--- a/modules/builddmrpp_module/NgapBuildDmrppContainerStorage.cc
+++ b/modules/builddmrpp_module/NgapBuildDmrppContainerStorage.cc
@@ -29,6 +29,7 @@
 
 #include <string>
 
+#include "RemoteResource.h"
 #include "NgapBuildDmrppContainerStorage.h"
 #include "NgapBuildDmrppContainer.h"