Fix missing include
Add missing error handling to lib
Merge branch 'master' into builds
7.519