diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index 1bc3de0..b84573e 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -28,5 +28,5 @@
   register: elasticsearch_install_from_package
 
 # ansible uri module requires httplib2
-- name: pip httplib2
-  apt: deb=python-httplib2
\ No newline at end of file
+- name: python-httplib2
+  apt: name=python-httplib2
\ No newline at end of file
diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml
index 67a32a3..da058eb 100644
--- a/tasks/elasticsearch-RedHat.yml
+++ b/tasks/elasticsearch-RedHat.yml
@@ -15,7 +15,7 @@
   yum: name=elasticsearch{% if es_version is defined and es_version != ""  %}-{{ es_version }}{% endif %} state=present update_cache=yes
   when: es_use_repository
   register: elasticsearch_install_from_repo
-  until: '"failed" not in es_use_repository'
+  until: '"failed" not in elasticsearch_install_from_repo'
   retries: 5
   delay: 10
 
@@ -25,5 +25,5 @@
   register: elasticsearch_install_from_package
 
 # ansible uri module requires python-httplib2
-- name: pip httplib2
+- name: python-httplib2
   yum: name=python-httplib2
\ No newline at end of file
diff --git a/tasks/xpack/elasticsearch-xpack-install.yml b/tasks/xpack/elasticsearch-xpack-install.yml
index dfe7962..77ddc58 100644
--- a/tasks/xpack/elasticsearch-xpack-install.yml
+++ b/tasks/xpack/elasticsearch-xpack-install.yml
@@ -4,6 +4,7 @@
 - shell: "{{es_home}}/bin/plugin list | sed -n '1!p' | grep {{item}}"
   register: feature_installed
   changed_when: False
+  failed_when: "'ERROR' in feature_installed.stdout"
   ignore_errors: yes
   environment:
     CONF_DIR: "{{ conf_dir }}"