Revised error messaging/handling