Slightly improved error messaging.