Start and stop no longer 'exit 1'

Change-Id: I54221fdc6679740b28a96aad8024988298548819