diff --git a/src/views/app.html b/src/views/app.html
index 7a239b365..8a6171638 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -414,7 +414,7 @@
               </div>
             </div>
 
-            <p class="text-small text-warning" ng-show="clone.location && clone.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: (appInstall.location + '.' + appInstall.domain.domain) }"></p>
+            <p class="text-small text-warning" ng-show="clone.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((clone.location ? clone.location + '.' : '') + appInstall.domain.domain) }"></p>
 
             <div class="has-error text-center" ng-show="clone.error.port">{{ clone.error.port }}</div>
             <div ng-repeat="(env, info) in clone.portBindingsInfo">
@@ -585,7 +585,7 @@
                 </div>
               </div>
 
-              <p class="text-small text-bold text-warning" ng-show="location.location && location.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: (location.location + '.' + location.domain.domain) }"></p>
+              <p class="text-small text-bold text-warning" ng-show="location.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((location.location ? location.location + '.' : '') + location.domain.domain) }"></p>
 
               <!-- hidden submit has to be prior to other button elements, otherwise firefox will treat them as the "enter" key action, in this case the alternate domain delete button! -->
               <input class="ng-hide" type="submit" ng-disabled="locationForm.$invalid || location.busy"/>
diff --git a/src/views/appstore.html b/src/views/appstore.html
index f72192eda..4c350ab6c 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -36,7 +36,7 @@
               <div ng-show="appInstall.error.location" class="text-small">{{ appInstall.error.location }}</div>
             </div>
 
-            <p class="text-small text-warning" ng-show="appInstall.location && appInstall.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: (appInstall.location + '.' + appInstall.domain.domain) }"></p>
+            <p class="text-small text-warning" ng-show="appInstall.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((appInstall.location ? appInstall.location + '.' : '') + appInstall.domain.domain) }"></p>
 
             <div class="has-error text-center" ng-show="appInstall.error.port">{{ appInstall.error.port }}</div>
             <div ng-repeat="(env, info) in appInstall.portBindingsInfo">