diff --git a/filefield_paths.module b/filefield_paths.module
index 2818468..de1f9e8 100644
--- a/filefield_paths.module
+++ b/filefield_paths.module
@@ -489,7 +489,7 @@ function filefield_paths_filefield_paths_process_file($new, &$file, $settings, &
   if ($new) {
     // Process filename
     $file['filename']['old'] = $file['field']['filename'];
-    if (($file['filename']['new'] = $settings['filename']['value']) != '') {
+    if (!empty($settings) && !empty($settings['filename']['value']) && ($file['filename']['new'] = $settings['filename']['value']) != '') {
       $file['filename']['new'] = filefield_paths_process_string($file['filename']['new'], 'node', $node, $settings['filename']);
       $file['filename']['new'] = filefield_paths_process_string($file['filename']['new'], 'field', array(0 => $file['field']), $settings['filename']);
     }
@@ -499,8 +499,13 @@ function filefield_paths_filefield_paths_process_file($new, &$file, $settings, &
 
     // Process filepath
     $file['filepath']['old'] = $file['field']['filepath'];
-    $file['filepath']['new'] = filefield_paths_process_string(file_directory_path() . "/{$settings['filepath']['value']}/{$file['filename']['new']}", 'node', $node, $settings['filepath']);
-    $file['filepath']['new'] = filefield_paths_process_string($file['filepath']['new'], 'field', array(0 => $file['field']), $settings['filepath']);
+    if (!empty($settings) && !empty($settings['filepath']['value'])) {
+      $file['filepath']['new'] = filefield_paths_process_string(file_directory_path() . '/' . $settings['filepath']['value'] . '/' . $file['filename']['new'], 'node', $node, $settings['filepath']);
+      $file['filepath']['new'] = filefield_paths_process_string($file['filepath']['new'], 'field', array(0 => $file['field']), $settings['filepath']);
+    }
+    else {
+      $file['filepath']['new'] = $file['field']['filepath'];
+    }
 
     // Finalize files if necessary
     if (dirname($file['filepath']['new']) != dirname($file['field']['filepath']) || $file['filename']['new'] != $file['field']['filename']) {