Handle broken repositories even better.
Bump version to 0.3.4
Merge branch 'release/0.3.4' into develop