bug-fix: remove throw exception

- see last bug-fix commit