diff --git a/files/usr/bin/upload-system-info b/files/usr/bin/upload-system-info
index 572f468..cdb4ae3 100755
--- a/files/usr/bin/upload-system-info
+++ b/files/usr/bin/upload-system-info
@@ -2,10 +2,15 @@
 
 import subprocess, os
 
-inxi = subprocess.Popen(['inxi', '-Fxxrzc0'], stdout=subprocess.PIPE)
-pastebin = subprocess.Popen(['/usr/bin/pastebin'], stdin=inxi.stdout, stdout=subprocess.PIPE)
-inxi.stdout.close()
-output = pastebin.communicate()[0]
-output = output.split()[0] # if we have more than one URL, only use the first one
-pastebin.wait()
-subprocess.call(['xdg-open', output])
+try:
+    inxi = subprocess.Popen(['inxi', '-Fxxrzc0'], stdout=subprocess.PIPE)
+    pastebin = subprocess.Popen(['/usr/bin/pastebin'], stdin=inxi.stdout, stdout=subprocess.PIPE)
+    inxi.stdout.close()
+    output = pastebin.communicate()[0]
+    output = output.split()[0] # if we have more than one URL, only use the first one
+    pastebin.wait()
+    subprocess.call(['xdg-open', output])
+except Exception as e:
+    print ("An error occurred while uploading the system information:")
+    print (e)
+    print ("Please make sure you're connected to the Internet.")