From 574089530a8c8ba040b708c98b6d1d6614cdedbd Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 13 Oct 2015 16:49:12 -0700
Subject: [PATCH] make sure request is not nullptr before using it

---
 interface/src/assets/ATPAssetMigrator.cpp | 39 +++++++++++++----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/interface/src/assets/ATPAssetMigrator.cpp b/interface/src/assets/ATPAssetMigrator.cpp
index 56adc38f9b..c268b351fa 100644
--- a/interface/src/assets/ATPAssetMigrator.cpp
+++ b/interface/src/assets/ATPAssetMigrator.cpp
@@ -96,24 +96,29 @@ void ATPAssetMigrator::loadEntityServerFile() {
                         } else if (wantsToMigrateResource(modelURL)) {
                             auto request = ResourceManager::createResourceRequest(this, modelURL);
                             
-                            qCDebug(asset_migrator) << "Requesting" << modelURL << "for ATP asset migration";
+                            if (request) {
+                                qCDebug(asset_migrator) << "Requesting" << modelURL << "for ATP asset migration";
+                                
+                                // add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
+                                // to an ATP one once ready
+                                _pendingReplacements.insert(modelURL, jsonValue);
+                                
+                                connect(request, &ResourceRequest::finished, this, [=]() {
+                                    if (request->getResult() == ResourceRequest::Success) {
+                                        migrateResource(request);
+                                    } else {
+                                        QMessageBox::warning(_dialogParent, "Error",
+                                                             QString("Could not retrieve asset at %1").arg(modelURL.toString()));
+                                    }
+                                    request->deleteLater();
+                                });
+                                
+                                request->send();
+                            } else {
+                                QMessageBox::warning(_dialogParent, "Error",
+                                                     QString("Could not create request for asset at %1").arg(modelURL.toString()));
+                            }
                             
-                            // add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
-                            // to an ATP one once ready
-                            _pendingReplacements.insert(modelURL, jsonValue);
-                            
-                            connect(request, &ResourceRequest::finished, this, [=]() {
-                                if (request->getResult() == ResourceRequest::Success) {
-                                    migrateResource(request);
-                                } else {
-                                    QMessageBox::warning(_dialogParent, "Error",
-                                                         QString("Could not retreive asset at %1").arg(modelURL.toString()));
-                                }
-                                request->deleteLater();
-                            });
-                            
-                            
-                            request->send();
                         } else {
                             _ignoredUrls.insert(modelURL);
                         }