Moved most of the logic from rolemappers to a common base class
Moved errormessage handling to appropriate place