diff --git a/gazpar2mqtt/rootfs/scripts/99-run.sh b/gazpar2mqtt/rootfs/scripts/99-run.sh
index 4ba6610d5..0754ea3d3 100644
--- a/gazpar2mqtt/rootfs/scripts/99-run.sh
+++ b/gazpar2mqtt/rootfs/scripts/99-run.sh
@@ -21,8 +21,8 @@ else
 fi
 
 # Check if yaml is valid
-yamllint -d relaxed --no-warnings $CONFIGSOURCE &>ERROR
-if [ $? = 0 ]; then
+yamllint -d relaxed --no-warnings $CONFIGSOURCE &> ERROR || EXIT_CODE=$?
+if [ $EXIT_CODE = 0 ]; then
     echo "Config file is a valid yaml"
 else
     bashio::log.fatal "Config file has an invalid yaml format. Please check the file in $CONFIGSOURCE. Errors list :"