Added failure-strategy handling and fixed a minor issue