adding error and clear message mapping

adding regular error message mapping
switch and create clear error message