Add additional info to failure messages

This addresses issue #28