Changes to prevent crashing in certain edge cases (within mp3's in my library).