Error message is now clearer
Merge branch 'master' into report-memory-improvements