diff --git a/bin/euscan b/bin/euscan
index b70600e..6f6463f 100755
--- a/bin/euscan
+++ b/bin/euscan
@@ -220,9 +220,9 @@ def main():
                   file=sys.stderr, end="")
             pp.die(1, "one of the above fully-qualified ebuild names instead.")
 	except GentoolkitException as err:
-            pp.die(1, str(err))
+            pp.die(1, '%s: %s' % (package, str(err)))
         except Exception as err:
-            pp.die(1, str(err))
+            pp.die(1, '%s: %s' % (package, str(err)))
 
         if not CONFIG['quiet']:
             print ()
diff --git a/pym/euscan/handlers/generic.py b/pym/euscan/handlers/generic.py
index fbae5a0..dde5a53 100644
--- a/pym/euscan/handlers/generic.py
+++ b/pym/euscan/handlers/generic.py
@@ -97,6 +97,8 @@ def scan(cpv, url):
             return []
 
     resolved_url = helpers.parse_mirror(url)
+    if not resolved_url:
+        return []
 
     cp, ver, rev = portage.pkgsplit(cpv)
 
@@ -115,6 +117,8 @@ def brute_force(cpv, url):
     cp, ver, rev = portage.pkgsplit(cpv)
 
     url = helpers.parse_mirror(url)
+    if not url:
+        return []
 
     for bp in BRUTEFORCE_BLACKLIST_PACKAGES:
         if re.match(bp, cp):
diff --git a/pym/euscan/helpers.py b/pym/euscan/helpers.py
index cad098b..88c0b72 100644
--- a/pym/euscan/helpers.py
+++ b/pym/euscan/helpers.py
@@ -407,7 +407,7 @@ def parse_mirror(uri):
         shuffle(mirrors)
         uri = mirrors[0].strip("/") + "/" + path
     else:
-        euscan.output.einfo("No known mirror by the name: %s\n" % (mirrorname))
+        euscan.output.einfo("No known mirror by the name: %s" % (mirrorname))
         return None
 
     return uri