Merge "Add error messages for wrong library names"