Fix rollback and test errno
Merge pull request #1720 from KreizIT/develop

Fix rollback and test errno