Index: trunk/ippdor/deployment/deploy.py
===================================================================
--- trunk/ippdor/deployment/deploy.py	(revision 32897)
+++ trunk/ippdor/deployment/deploy.py	(revision 32904)
@@ -12,4 +12,7 @@
 
 if __name__ == '__main__':
+    if os.getenv('PYTHONPATH') is not None:
+        print 'Error: Unset PYTHONPATH environment variable to run this program'
+        sys.exit(1)
     USAGE = """usage: %prog [options] <ipp site definition file>
 
@@ -78,5 +81,8 @@
     LOGGER.info('Cleaning temporary site definitions')
     os.remove('.tmp_site/IppSite.py')
-    os.remove('.tmp_site/IppSite.pyc')
+    try:
+        os.remove('.tmp_site/IppSite.pyc')
+    except OSError:
+        pass # Ignore if not compiled
     os.remove('.tmp_site/__init__.py')
     os.rmdir('.tmp_site')