Returning None instead of the empty to fix a bug on melange-demo instance.
Returning None instead of the empty to fix a bug on melange-demo instance.

Patch by: Lennard de Rijk
Reviewed by: to-be-reviewed

MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging