Missing scope in conditions lead to mapping problems (NullPointerException)

introducted with if else endif statements

(from redmine: issue id 873, created on 2018-01-22tgradl)