From ba475edd78a8940915c0cda718ad35db466b8d88 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 17 Sep 2013 22:41:16 -0400
Subject: [PATCH] CLJS-590: NPE when using :source-map with :whitespace
 optimizations

---
 src/clj/cljs/closure.clj | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/clj/cljs/closure.clj b/src/clj/cljs/closure.clj
index a98cbdf7ae..24cef371bc 100644
--- a/src/clj/cljs/closure.clj
+++ b/src/clj/cljs/closure.clj
@@ -722,12 +722,13 @@
             (loop [sources (seq sources)
                    merged (sorted-map-by
                             (sm/source-compare
-                              (map (fn [source]
-                                     (if-let [^URL source-url (:source-url source)]
-                                       (.getPath source-url)
-                                       (let [^URL url (:url source)]
-                                         (.getPath url))))
-                                   sources)))]
+                              (remove nil?
+                                (map (fn [source]
+                                       (if-let [^URL source-url (:source-url source)]
+                                         (.getPath source-url)
+                                         (if-let [^URL url (:url source)]
+                                           (.getPath url))))
+                                  sources))))]
               (if sources
                 (let [source (first sources)]
                   (recur (next sources)