Cleanups
Make Neutron discovery work in exception mode

$? cannot be used anymore in exception mode.