Added new error messaging