diff --git a/build/shared/tools/MovieMaker/src/ch/randelshofer/gui/datatransfer/FileTextFieldTransferHandler.java b/build/shared/tools/MovieMaker/src/ch/randelshofer/gui/datatransfer/FileTextFieldTransferHandler.java
index 9e5ce36b0..adb7f01cb 100644
--- a/build/shared/tools/MovieMaker/src/ch/randelshofer/gui/datatransfer/FileTextFieldTransferHandler.java
+++ b/build/shared/tools/MovieMaker/src/ch/randelshofer/gui/datatransfer/FileTextFieldTransferHandler.java
@@ -84,7 +84,8 @@ public class FileTextFieldTransferHandler extends TransferHandler {
             }
 
             try {
-                List list = (List) t.getTransferData(DataFlavor.javaFileListFlavor);
+                List<?> list = (List<?>) 
+                    t.getTransferData(DataFlavor.javaFileListFlavor);
                 if (list.size() > 0) {
                     File file = (File) list.get(0);
 
diff --git a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
index e3f559f3f..a482e1fbf 100644
--- a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
+++ b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
@@ -533,10 +533,10 @@ public class MovieMaker extends JFrame implements Tool {
     // ---------------------------------
     // Create the QuickTime movie
     // ---------------------------------
-    SwingWorker w = new SwingWorker() {
+    SwingWorker<Throwable, ?> w = new SwingWorker<Throwable, Object>() {
 
       @Override
-      protected Object doInBackground() {
+      protected Throwable doInBackground() {
         try {
           // Read image files
           File[] imgFiles = null;
@@ -600,20 +600,18 @@ public class MovieMaker extends JFrame implements Tool {
 
       @Override
       protected void done() {
-        Object o;
+        Throwable t;
         try {
-          o = get();
+          t = get();
         } catch (Exception ex) {
-          o = ex;
-        }
-        if (o instanceof Throwable) {
-          Throwable t = (Throwable) o;
-          t.printStackTrace();
-          JOptionPane.showMessageDialog(MovieMaker.this,
-              Language.text("movie_maker.error.movie_failed") + "\n" + (t.getMessage() == null ? t.toString() : t.getMessage()),
-              Language.text("movie_maker.error.sorry"),
-              JOptionPane.ERROR_MESSAGE);
+          t = ex;
         }
+        t.printStackTrace();
+        JOptionPane.showMessageDialog(MovieMaker.this,
+                                      Language.text("movie_maker.error.movie_failed") + "\n" +
+                                      (t.getMessage() == null ? t.toString() : t.getMessage()),
+                                      Language.text("movie_maker.error.sorry"),
+                                      JOptionPane.ERROR_MESSAGE);
         createMovieButton.setEnabled(true);
       }
     };