Merge "Add library name to error message"