Improve goBackOnError method
Merge pull request #80 from maxirosson/dev

Improve goBackOnError method