diff --git a/agentx/agent.py b/agentx/agent.py
index 067d1cc..92612be 100644
--- a/agentx/agent.py
+++ b/agentx/agent.py
@@ -38,7 +38,9 @@ class Agent(object):
 
     def run(self):
         self.logger.info('Calling setup')
-        self.setup()
+        if not self.setup():
+            self.logger.error('Setup failed - exiting')
+            return
 
         self.logger.info('Initial update')
         self._update()
diff --git a/vpp-snmp-agent.py b/vpp-snmp-agent.py
index 3ec3d5f..dd82399 100755
--- a/vpp-snmp-agent.py
+++ b/vpp-snmp-agent.py
@@ -238,5 +238,7 @@ def main():
     except KeyboardInterrupt:
         a.stop()
 
+    sys.exit(-1)
+
 if __name__ == "__main__":
     main()