Exceptions von hero

Change-Id: Ib64b661a05fe9a24a08730e30140af365d7c49b6
Signed-off-by: Miriam <Miriam@MI-I15z>