diff --git a/custompkg/root/etc/skel/Library/bashrc.d/200.aws-python-module-bash-completion.sh b/custompkg/root/etc/skel/Library/bashrc.d/200.aws-python-module-bash-completion.sh
index b4c6db9..51d8353 100644
--- a/custompkg/root/etc/skel/Library/bashrc.d/200.aws-python-module-bash-completion.sh
+++ b/custompkg/root/etc/skel/Library/bashrc.d/200.aws-python-module-bash-completion.sh
@@ -1,4 +1,8 @@
 # bash completion for awscli
-source `which aws_bash_completer`
+if which aws_bash_completer 2>&1 >/dev/null; then
+    source `which aws_bash_completer`
+fi
 # bash completion for elastic beanstalk
-source `which eb_completion.bash`
+if which eb_completion.bash 2>&1 >/dev/null; then
+    source `which eb_completion.bash`
+fi