Fix library names.
Fix regression in error handling.