WIP error msgs for registration
merge