Fixing some error messaging stuff.