Reverted the introducion of BC classes for beberlei\assert
Added original message to assertion