diff --git a/salt/files/restore_minion.sh b/salt/files/restore_minion.sh
index f8dc36b..a6ea1d4 100644
--- a/salt/files/restore_minion.sh
+++ b/salt/files/restore_minion.sh
@@ -6,6 +6,6 @@
 mkdir -p /etc/pki/pki_ca.bak
 mkdir -p /etc/pki/ca
 mv /etc/pki/ca/* /etc/pki/pki_ca.bak
-scp -r backupninja@{{ minion.initial_data.source }}:/srv/backupninja/{{ minion.initial_data.host }}/etc/pki/ca/ca.0/* /etc/pki/ca
+scp -r backupninja@{{ minion.initial_data.source }}:{{ minion.initial_data.get('home_dir', '/srv/backupninja') }}/{{ minion.initial_data.host }}/etc/pki/ca/ca.0/* /etc/pki/ca
 {%- endif %}
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/salt/meta/salt.yml b/salt/meta/salt.yml
index cb50afd..91c0dfe 100644
--- a/salt/meta/salt.yml
+++ b/salt/meta/salt.yml
@@ -3,7 +3,7 @@
   {%- set grains_fragment_file = service_name+'/meta/meta.yml' %}
   {%- macro load_grains_file() %}{% include grains_fragment_file ignore missing %}{% endmacro %}
   {%- set grains_yaml = load_grains_file()|load_yaml %}
-  {%- if grains_yaml is mapping %}
+  {%- if grains_yaml is mapping and grains_yaml.graph %}
     {%- for node in grains_yaml.graph if grains_yaml.graph %}
     {%- do service_grains.salt.graph.append(node) %}
     {%- endfor %}