diff --git a/src/controllers/404.js b/src/controllers/404.js
index 550f7b1785..baa8d05650 100644
--- a/src/controllers/404.js
+++ b/src/controllers/404.js
@@ -9,7 +9,7 @@ var plugins = require('../plugins');
 
 exports.handle404 = function handle404(req, res) {
 	var relativePath = nconf.get('relative_path');
-	var isClientScript = new RegExp('^' + relativePath + '\\/assets\\/src\\/.+\\.js');
+	var isClientScript = new RegExp('^' + relativePath + '\\/assets\\/src\\/.+\\.js$');
 
 	if (plugins.hasListeners('action:meta.override404')) {
 		return plugins.fireHook('action:meta.override404', {
diff --git a/src/meta/minifier.js b/src/meta/minifier.js
index e4722e1339..444851f62b 100644
--- a/src/meta/minifier.js
+++ b/src/meta/minifier.js
@@ -232,7 +232,7 @@ function minifyAndSave(data, callback) {
 	var minified = uglify.minify(scripts, {
 		sourceMap: {
 			filename: data.filename,
-			url: data.filename + '.map',
+			url: String(data.filename).split(/[\/\\]/).pop() + '.map',
 			includeSources: true,
 		},
 		compress: false,