ALM-152 moved error message handling from controller into model