Album: Added some error checking.