ALM-152 added better error messages