diff --git a/rho/scancommand.py b/rho/scancommand.py
index 2fff63e..c6b2341 100644
--- a/rho/scancommand.py
+++ b/rho/scancommand.py
@@ -624,3 +624,4 @@ def _do_command(self):
         else:
             print(_("An error has occurred during the scan. Please review" +
                     " the output to resolve the given issue."))
+            sys.exit(1)
diff --git a/roles/etc_release/tasks/main.yml b/roles/etc_release/tasks/main.yml
index 239355d..c01fa27 100644
--- a/roles/etc_release/tasks/main.yml
+++ b/roles/etc_release/tasks/main.yml
@@ -16,95 +16,107 @@
   set_fact: etc_release_release=""
   when: '"etc_release.release" in facts_to_collect'
 
+- name: initialize get_etc_release_name
+  set_fact: get_etc_release_name={{ "etc_release.name" in facts_to_collect }}
+
+- name: initialize get_etc_release_version
+  set_fact: get_etc_release_version={{ "etc_release.version" in facts_to_collect }}
+
+- name: initialize get_etc_release_release
+  set_fact: get_etc_release_release={{ "etc_release.release" in facts_to_collect }}
+
+- name: initialize get_etc_release
+  set_fact: get_etc_release={{ get_etc_release_name or get_etc_release_version or get_etc_release_release }}
+
 - name: check if /etc/lsb-release file exists
   raw: if [ -f /etc/lsb-release ]; then echo "Y"; else echo "N"; fi
   register: lbs_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/debian_version file exists
   raw: if [ -f /etc/debian_version ]; then echo "Y"; else echo "N"; fi
   register: debian_version_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/redhat-release file exists
   raw: if [ -f /etc/redhat-release ]; then echo "Y"; else echo "N"; fi
   register: redhat_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/release file exists
   raw: if [ -f /etc/release ]; then echo "Y"; else echo "N"; fi
   register: etc_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/SuSE-release file exists
   raw: if [ -f /etc/SuSE-release ]; then echo "Y"; else echo "N"; fi
   register: SuSE_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/mandriva-release file exists
   raw: if [ -f /etc/mandriva-release ]; then echo "Y"; else echo "N"; fi
   register: mandriva_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/enterprise-release file exists
   raw: if [ -f /etc/enterprise-release ]; then echo "Y"; else echo "N"; fi
   register: enterprise_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/sun-release file exists
   raw: if [ -f /etc/sun-release ]; then echo "Y"; else echo "N"; fi
   register: sun_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/slackware-release file exists
   raw: if [ -f /etc/slackware-release ]; then echo "Y"; else echo "N"; fi
   register: slackware_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/ovs-release file exists
   raw: if [ -f /etc/ovs-release ]; then echo "Y"; else echo "N"; fi
   register: ovs_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
 - name: check if /etc/ovs-release file exists
   raw: if [ -f /etc/ovs-release ]; then echo "Y"; else echo "N"; fi
   register: arch_release_found
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect'
+  when: 'get_etc_release'
 
-- name: set os for etc_release.name based on lbs_release_found
+- name: set os for etc_release data based on lbs_release_found
   raw: . /etc/lsb-release; echo "$DISTRIB_ID";
   register: lbs_release_found_os
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and lbs_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and lbs_release_found["stdout_lines"][0] == "Y"'
 
-- name: set ver for etc_release.name based on lbs_release_found
+- name: set ver for etc_release data based on lbs_release_found
   raw: . /etc/lsb-release; echo "$DISTRIB_RELEASE";
   register: lbs_release_found_ver
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and lbs_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and lbs_release_found["stdout_lines"][0] == "Y"'
 
-- name: gather etc_release.name based on lbs_release_found
+- name: gather etc_release data based on lbs_release_found
   set_fact: etc_release_name=lbs_release_found_os["stdout_lines"][0]
   when: '"etc_release.name" in facts_to_collect and lbs_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.version based on lbs_release_found
   set_fact: etc_release_version=lbs_release_found_ver["stdout_lines"][0]
-  when: '"etc_release.name" in facts_to_collect and lbs_release_found["stdout_lines"][0] == "Y"'
+  when: '"etc_release.version" in facts_to_collect and lbs_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.release based on lbs_release_found
   set_fact: etc_release_release="{{ etc_release_name + " " + etc_release_version }}"
-  when: '"etc_release.name" in facts_to_collect and lbs_release_found["stdout_lines"][0] == "Y"'
+  when: '"etc_release.release" in facts_to_collect and lbs_release_found["stdout_lines"][0] == "Y"'
 
 - name: set os for etc_release.name based on debian_version_found
   set_fact: etc_release_name="Debian"
@@ -114,23 +126,23 @@
   raw: cat /etc/debian_version
   register: debian_version_found_ver
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and debian_version_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and debian_version_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.version based on debian_version_found
   set_fact: etc_release_version=debian_version_found_ver["stdout_lines"][0]
-  when: '"etc_release.name" in facts_to_collect and debian_version_found["stdout_lines"][0] == "Y"'
+  when: '"etc_release.version" in facts_to_collect and debian_version_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.release based on debian_version_found
   set_fact: etc_release_release="{{ etc_release_name + " " + etc_release_version }}"
-  when: '"etc_release.name" in facts_to_collect and debian_version_found["stdout_lines"][0] == "Y"'
+  when: '"etc_release.release" in facts_to_collect and debian_version_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on redhat_release_found
+- name: set rel for etc_release data based on redhat_release_found
   raw: cat /etc/redhat-release
   register: redhat_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and redhat_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and redhat_release_found["stdout_lines"][0] == "Y"'
 
-- name: gather etc_release.name based on redhat_release_found_release
+- name: gather etc_release data based on redhat_release_found_release
   set_fact: etc_release_name="{{ redhat_release_found_release['stdout_lines'][0].split('release')[0] }}"
   when: '"etc_release.name" in facts_to_collect and redhat_release_found["stdout_lines"][0] == "Y"'
 
@@ -142,11 +154,11 @@
   set_fact: etc_release_release="{{ redhat_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and redhat_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on etc_release_found
+- name: set rel for etc_release data based on etc_release_found
   raw: cat /etc/release
   register: etc_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and etc_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and etc_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on etc_release_found
   set_fact: etc_release_name="{{ etc_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -160,11 +172,11 @@
   set_fact: etc_release_release="{{ etc_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and etc_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on SuSE_release_found
+- name: set rel for etc_release data based on SuSE_release_found
   raw: cat /etc/SuSE-release
   register: SuSE_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and SuSE_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and SuSE_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on SuSE_release_found
   set_fact: etc_release_name="{{ SuSE_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -178,11 +190,11 @@
   set_fact: etc_release_release="{{ SuSE_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and SuSE_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on mandriva_release_found
+- name: set rel for etc_release data based on mandriva_release_found
   raw: cat /etc/mandriva-release
   register: mandriva_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and mandriva_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and mandriva_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on mandriva_release_found
   set_fact: etc_release_name="{{ mandriva_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -196,11 +208,11 @@
   set_fact: etc_release_release="{{ mandriva_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and mandriva_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on enterprise_release_found
+- name: set rel for etc_release data based on enterprise_release_found
   raw: cat /etc/enterprise-release
   register: enterprise_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and enterprise_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and enterprise_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on enterprise_release_found
   set_fact: etc_release_name="{{ enterprise_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -214,11 +226,11 @@
   set_fact: etc_release_release="{{ enterprise_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and enterprise_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on sun_release_found
+- name: set rel for etc_release data based on sun_release_found
   raw: cat /etc/sun-release
   register: sun_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and sun_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and sun_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on sun_release_found
   set_fact: etc_release_name="{{ sun_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -232,11 +244,11 @@
   set_fact: etc_release_release="{{ sun_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and sun_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on slackware_release_found
+- name: set rel for etc_release data based on slackware_release_found
   raw: cat /etc/slackware-release
   register: slackware_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and slackware_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and slackware_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on slackware_release_found
   set_fact: etc_release_name="{{ slackware_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -250,11 +262,11 @@
   set_fact: etc_release_release="{{ slackware_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and slackware_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on ovs_release_found
+- name: set rel for etc_release data based on ovs_release_found
   raw: cat /etc/ovs-release
   register: ovs_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and ovs_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and ovs_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on ovs_release_found
   set_fact: etc_release_name="{{ ovs_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -268,11 +280,11 @@
   set_fact: etc_release_release="{{ ovs_release_found_release['stdout_lines'][0] }}"
   when: '"etc_release.release" in facts_to_collect and ovs_release_found["stdout_lines"][0] == "Y"'
 
-- name: set rel for etc_release.name based on arch_release_found
+- name: set rel for etc_release data based on arch_release_found
   raw: cat /etc/arch-release
   register: arch_release_found_release
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and arch_release_found["stdout_lines"][0] == "Y"'
+  when: 'get_etc_release and arch_release_found["stdout_lines"][0] == "Y"'
 
 - name: gather etc_release.name based on arch_release_found
   set_fact: etc_release_name="{{ arch_release_found_release['stdout_lines'][0].split('release')[0] }}"
@@ -290,7 +302,7 @@
   raw: uname -s
   register: etc_release_uname_os
   ignore_errors: yes
-  when: '"etc_release.name" in facts_to_collect and etc_release_name == ""'
+  when: 'get_etc_release and etc_release_name == ""'
 
 - name: gather etc_release.name based on etc_release_uname_os
   set_fact: etc_release_name='{{ etc_release_uname_os["stdout_lines"][0] | default('error') } }}'