diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 569585f6f..1cd0ee8a7 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -52,13 +52,21 @@
{% endunless %}
{% for entry in site.data.contact %}
+ {%- assign url = null -%}
+
{% case entry.type %}
{% when 'github', 'twitter' %}
+ {%- unless site[entry.type].username -%}
+ {%- continue -%}
+ {%- endunless -%}
{%- capture url -%}
https://{{ entry.type }}.com/{{ site[entry.type].username }}
{%- endcapture -%}
{% when 'email' %}
- {% assign email = site.social.email | split: '@' %}
+ {%- unless site.social.email -%}
+ {%- continue -%}
+ {%- endunless -%}
+ {%- assign email = site.social.email | split: '@' -%}
{%- capture url -%}
javascript:location.href = 'mailto:' + ['{{ email[0] }}','{{ email[1] }}'].join('@')
{%- endcapture -%}