diff --git a/bin/minindn b/bin/minindn
index c8530e6..324513b 100755
--- a/bin/minindn
+++ b/bin/minindn
@@ -76,6 +76,7 @@
 import datetime
 from os.path import expanduser
 import sys
+import signal
 from subprocess import call
 
 from ndn.nlsr import Nlsr, NlsrConfigGenerator
@@ -380,11 +381,19 @@
         print("Moving results to %s" % options.resultDir)
         os.system("sudo mv /%s/* %s" % (options.workDir, options.resultDir))
 
+def signal_handler(signal, frame):
+    print('Cleaning up...')
+    call(["nfd-stop"])
+    call(["sudo", "mn", "--clean"])
+    sys.exit(1)
+
 if __name__ == '__main__':
 
     hosts_conf = []
     links_conf = []
 
+    signal.signal(signal.SIGINT, signal_handler)
+
     options = parse_args()
 
     setLogLevel('info')
diff --git a/ndn/experiments/experiment.py b/ndn/experiments/experiment.py
index 385ff2a..e7b713a 100644
--- a/ndn/experiments/experiment.py
+++ b/ndn/experiments/experiment.py
@@ -83,8 +83,7 @@
             print("NLSR has successfully converged.")
         else:
             print("NLSR has not converged. Exiting...")
-            for host in self.net.hosts:
-                host.nfd.stop()
+            self.net.stop()
             sys.exit(1)
 
     def ping(self, source, dest, nPings):