'&&' doesn't mix well with 'set -e' - build was failing because of that