Merge "even better error handling in id3 tag parsing."