diff --git a/src/com/annimon/socketfiletransfer/operations/FileOperation.java b/src/com/annimon/socketfiletransfer/operations/FileOperation.java
index ae87369..69441c3 100644
--- a/src/com/annimon/socketfiletransfer/operations/FileOperation.java
+++ b/src/com/annimon/socketfiletransfer/operations/FileOperation.java
@@ -29,12 +29,11 @@ public class FileOperation extends Operation {
                 fout.write(buffer, 0, count);
             }
             fout.flush();
-            fout.close();
         } catch (IOException ex) {
             ExceptionHandler.handle(ex);
         } finally {
             try {
-                fout.close();
+                if (fout != null) fout.close();
             } catch (IOException ex) {
                 ExceptionHandler.handle(ex);
             }
@@ -43,7 +42,8 @@ public class FileOperation extends Operation {
 
     @Override
     public void startClientSide(Object... params) throws Exception {
-        File file = (File) params[0];
+        String filePath = (String) params[0];
+        File file = new File(filePath);
         
         dos.writeInt(OperationListener.MODE_FILE_TRANSFER);