diff --git a/src/_services/system.service.js b/src/_services/system.service.js
index 2490e2a..a011117 100644
--- a/src/_services/system.service.js
+++ b/src/_services/system.service.js
@@ -70,6 +70,7 @@ function createEntity(entityConfig, json, messages, errors) {
 function modelSetup(file, messages, errors) {
     let formData = new FormData();
     formData.append('file', file);
+    formData.append('name', file.name);
     return fetch(`${config.apiUrl}/me/model`, util.postFileWithAuth(formData))
         .then(util.handleCrudResponse(messages, errors))
         .then(entity => { return entity; });
diff --git a/src/admin/ModelSetupPage.vue b/src/admin/ModelSetupPage.vue
index b6f2c2a..f394d20 100644
--- a/src/admin/ModelSetupPage.vue
+++ b/src/admin/ModelSetupPage.vue
@@ -110,6 +110,10 @@
                 console.log('handleFileUpload, set this.file='+JSON.stringify(this.file.name));
             },
             uploadModel(e) {
+                if (this.file === null) {
+                    console.log('uploadModel: no file set, not uploading');
+                    return;
+                }
                 this.modelSetup({file: this.file, messages: this.messages, errors: this.errors});
                 this.showingUploadDialog = false;
             },