added trait modifiers, wrong variable was used && added empty finally expression, when it is empty