Updated error messaging