[trunk] Be more verbose about failure.