Merge pull request #2186 from nnnick/fix/2115

Better handling when data.datasets does not exist