Added null-checks to resolve artist/album methods in InfoSystem.