Return None when the called method returned None

The previous behaviour was to return an empty list.