diff --git a/seqs/mayan-edms.sh b/seqs/mayan-edms.sh
index a05d666..96499b9 100755
--- a/seqs/mayan-edms.sh
+++ b/seqs/mayan-edms.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 toolName="Mayan EDMS"
-toolVersion="3.3.4"
+toolVersion="3.3.5"
 toolRoot="/opt/mayan-edms"
 toolMediaFolder="/opt/mayan-edms/media"
 
@@ -24,9 +24,7 @@ step_2() {
   libjpeg-dev libmagic1 libpq-dev libpng-dev libtiff-dev \
   poppler-utils postgresql python3-dev python3-venv python3-virtualenv python3-pip
   redis-server sane-utils supervisor tesseract-ocr tesseract-ocr-deu zlib1g-dev -y
-  
-  saveReturn $?
-  endReturn
+  endReturn -o $? "Binary dependencies installation failed"
 
   exe systemctl enable supervisor
   exe systemctl stop supervisor
@@ -37,8 +35,7 @@ step_3() {
   exe adduser --disabled-password --disabled-login --no-create-home --gecos "" mayan
   exe usermod -a -G users mayan
   exe python3 -m venv ${toolRoot}
-  saveReturn $?
-  endReturn 
+  endReturn -o $? "Creating virtual environment failed"
   exe chown -R mayan:mayan ${toolRoot}
 }
 
@@ -59,11 +56,9 @@ step_5() {
   step upgradepip
 
   exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir mayan-edms
-  saveReturn $?
-  endReturn 
+  endReturn -o $? "pip install for $toolName failed"
   exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir psycopg2==2.8.3 redis==3.2.1
-  saveReturn $?
-  endReturn 
+  endReturn -o $?
 }
 
 step_6_info() { echo "Supervisord configuration for $toolName"; }
@@ -96,17 +91,15 @@ maxmemory-policy allkeys-lru
 save \"\"
 databases 2"
 
-step_10_info() { echo "Update $toolName"; }
+step_10_info() { echo "Upgrade $toolName to $toolVersion"; }
 step_10_alias() { ALIAS="upgrade"; }
 step_10() {
   exe curl -o "$uninstallRemovalsLoc" https://gitlab.com/mayan-edms/mayan-edms/raw/master/removals.txt
   exe sudo -u mayan ${toolRoot}/bin/pip uninstall -r "$uninstallRemovalsLoc"
-  saveReturn $?
-  endReturn
+  endReturn -o $?
   exe systemctl stop supervisor
   exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir mayan-edms==$toolVersion
-  saveReturn $?
-  endReturn
+  endReturn -o $?
   toolScript performupgrade
   toolScript preparestatic --noinput
   # Generating new supervisor file
@@ -196,5 +189,5 @@ toolScript() {
   ${toolRoot}/bin/mayan-edms.py $*"
 }
 
-VERSION_SEQREV=7
+VERSION_SEQREV=8
 . sequencer.sh