Finally worked around the issue with needing to use 0 instead of -1

Change-Id: I98bfa349869b7f5ec546c6a09ffe2fa8671384bf
Protection against null

Change-Id: Iab8b043d7354a058d9a0bd89771a6d010951290f
Merge topic 'fix_parallel_amrconnectivity' into next

540aad75 Protection against null
c15093d8 Finally worked around the issue with needing to use 0 instead of -1