diff --git a/CHANGELOG.md b/CHANGELOG.md
index de7545b9..d948b577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # v1.8.2
 ## mm/dd/2018
 
-1. [](#bugfix)
+1. [](#new)
     * Added custom object support for filepicker field
 
 # v1.8.1
diff --git a/classes/adminbasecontroller.php b/classes/adminbasecontroller.php
index 1a4090ec..cc315b0d 100644
--- a/classes/adminbasecontroller.php
+++ b/classes/adminbasecontroller.php
@@ -261,7 +261,7 @@ class AdminBaseController
         }
 
         // Handle errors and breaks without proceeding further
-        if ($upload->file->error != UPLOAD_ERR_OK) {
+        if ($upload->file->error !== UPLOAD_ERR_OK) {
             $this->admin->json_response = [
                 'status'  => 'error',
                 'message' => sprintf($this->admin->translate('PLUGIN_ADMIN.FILEUPLOAD_UNABLE_TO_UPLOAD', null),
@@ -780,7 +780,7 @@ class AdminBaseController
             $folder = Folder::getRelativePath(rtrim($folder, '/'));
             $folder = $this->admin->getPagePathFromToken($folder);
 
-            $media           = new Media($folder);
+            $media = new Media($folder);
         }
 
         $available_files = [];
diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index e3b1be85..73d567e7 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -1687,9 +1687,16 @@ class AdminController extends AdminBaseController
             return false;
         }
 
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $path = $media->path();
+        if ($locator->isStream($path)) {
+            $path = $locator->findResource($path, true, true);
+        }
+
         // Upload it
         if (!move_uploaded_file($_FILES['file']['tmp_name'],
-            sprintf('%s/%s', $media->path(), $_FILES['file']['name']))
+            sprintf('%s/%s', $path, $_FILES['file']['name']))
         ) {
             $this->admin->json_response = [
                 'status'  => 'error',