Index: trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java	(revision 11643)
+++ trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java	(revision 11645)
@@ -138,11 +138,13 @@
 
         private void runPostLoadTasks() {
-            for (Runnable task : postLoadTasks) {
-                if (canceled)
-                    return;
-                if (task == null) {
-                    continue;
+            if (postLoadTasks != null) {
+                for (Runnable task : postLoadTasks) {
+                    if (canceled)
+                        return;
+                    if (task == null) {
+                        continue;
+                    }
+                    task.run();
                 }
-                task.run();
             }
         }
Index: trunk/src/org/openstreetmap/josm/io/session/SessionReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/SessionReader.java	(revision 11643)
+++ trunk/src/org/openstreetmap/josm/io/session/SessionReader.java	(revision 11645)
@@ -256,5 +256,5 @@
                 } else
                     throw new IOException(tr("Unsupported scheme ''{0}'' in URI ''{1}''.", uri.getScheme(), uriStr));
-            } catch (URISyntaxException e) {
+            } catch (URISyntaxException | IllegalArgumentException e) {
                 throw new IOException(e);
             }