SC4G #51: Added additional error messages