Adapted warnings and errors to return rule behavior

Change-Id: I01105cae3c458edb4cc640ee037fb1355a8773cf
Signed-off-by: mstegmaier <michael-1.stegmaier@uni-ulm.de>