Make final, incomplete changes

Patch 6.0.2 made this project irrelevant. This commit only contains some
incomplete changes that were meant to improve error handling (by adding some
error logging) and increase robustness.