Be more robust when a module fails to merge

The exception handling would actually mean that "cd .." was missed when
an exception occurred (eg no gerrit remote in repo).

Change-Id: I056e103cce6c5714a905c434e8341273d48db591
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>