diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java
index 6d7544b3acb8..88999499e3d8 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetbrains.debugger.sourcemap;
 
 import com.intellij.openapi.util.SystemInfo;
@@ -93,6 +108,7 @@ public class SourceResolver {
         if (canonicalPath != null && !canonicalPath.equals(path)) {
           absoluteLocalPathToSourceIndex.put(canonicalPath, sourceIndex);
         }
+        return Urls.newLocalFileUrl(path);
       }
     }
     return new UrlImpl(baseUrl.getScheme(), baseUrl.getAuthority(), path, null);
diff --git a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java b/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java
index 7d763894ae8b..7fc7bd69aa06 100644
--- a/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java
+++ b/platform/script-debugger/debugger-ui/src/com/jetbrains/javascript/debugger/NameMapper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.jetbrains.javascript.debugger;
 
 import com.google.common.base.CharMatcher;
@@ -82,7 +97,7 @@ public class NameMapper {
   public static void warnSeveralMapping(@NotNull PsiElement element) {
     // see https://dl.dropboxusercontent.com/u/43511007/s/Screen%20Shot%202015-01-21%20at%2020.33.44.png
     // var1 mapped to the whole "var c, notes, templates, ..." expression text + unrelated text "   ;"
-    LOG.warn("incorrect sourcemap, several mappings for named element " + element);
+    LOG.warn("incorrect sourcemap, several mappings for named element " + element.getText());
   }
 
   @NotNull