Change rethrow logic
Merge branch 'develop' of https://github.com/islog/liblogicalaccess into develop