Fixed error messages for Factory service