Minimal fix for asserts around spark-toolbar instanciations
Merge pull request #2240 from ussuri/fix-toolbar-asserts

Minimal fix for asserts around spark-toolbar instanciations