This patch improves the error handling for several arbitrary issues I
encountered while experimenting with the tool this evening.