diff --git a/dashboard/static/images/favicon.png b/dashboard/static/images/favicon.png
new file mode 100644
index 000000000..2c7467c1c
Binary files /dev/null and b/dashboard/static/images/favicon.png differ
diff --git a/dashboard/templates/layout.html b/dashboard/templates/layout.html
index 41a30371c..9a9ed9e28 100644
--- a/dashboard/templates/layout.html
+++ b/dashboard/templates/layout.html
@@ -10,6 +10,7 @@
 <link href='http://fonts.googleapis.com/css?family=PT+Sans+Caption&subset=latin,cyrillic' rel='stylesheet' type='text/css' />
 <link href='http://fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700&subset=latin,cyrillic' rel='stylesheet' type='text/css' />
 
+<link rel="icon" href="{{ url_for('static', filename='images/favicon.png') }}" type="image/png"/>
 
 <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/style.css') }}">
 <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/jquery.jqplot.min.css') }}">
diff --git a/stackalytics/processor/main.py b/stackalytics/processor/main.py
index b51226342..8b6329d4f 100644
--- a/stackalytics/processor/main.py
+++ b/stackalytics/processor/main.py
@@ -36,7 +36,8 @@ def get_pids():
         try:
             p = psutil.Process(pid)
             if p.cmdline and p.cmdline[0].find('/uwsgi'):
-                uwsgi_dict[p.pid] = p.parent.pid
+                if p.parent:
+                    uwsgi_dict[p.pid] = p.parent.pid
         except _error.NoSuchProcess:
             # the process may disappear after get_pid_list call, ignore it
             pass