Improved error messaging slightly.