2.5.1 exception fix

Author git <vivec@telvanni.eu>
Author date 2018-06-02 13:27:52
Author local date 2018-06-02 15:27:52 +0200
Committer git <vivec@telvanni.eu>
Committer date 2018-06-02 13:27:52
Committer local date 2018-06-02 15:27:52 +0200
Commit d368e1d53ca005bd61c386dba11327ebb050711e
Tree 32f6d811c1d5b56ddd801d533b7d075c54a7c2c5
Parent 29b5dee4ccc07d32a03c311b1e43d5218c637ed0
2.5.1 exception fix