Merge "Replace some MWException usage in User"