cleaned up error messaging.