Index: source/python/classes/ControlFile.py
===================================================================
--- source/python/classes/ControlFile.py	(revision 25b14bea5de21f28364c210382513c1c9b792d61)
+++ source/python/classes/ControlFile.py	(revision 4971f63213e5e9edb2e7e207ee071d404b6949f4)
@@ -180,7 +180,15 @@
 
         # read whole CONTROL file
-        with open(os.path.join(_config.PATH_CONTROLFILES,
-                               self.controlfile)) as f:
-            fdata = f.read().split('\n')
+
+        try:
+            with open(os.path.join(_config.PATH_CONTROLFILES,
+                                   self.controlfile)) as f:
+                fdata = f.read().split('\n')
+        except IOError:
+            print('Could not read CONTROL file "' + args.controlfile + '"')
+            print('Either it does not exist or its syntax is wrong.')
+            print('Try "' + sys.argv[0].split('/')[-1] + \
+                      ' -h" to print usage information')
+            sys.exit(1)
 
         # go through every line and store parameter
Index: source/python/classes/EcFlexpart.py
===================================================================
--- source/python/classes/EcFlexpart.py	(revision 25b14bea5de21f28364c210382513c1c9b792d61)
+++ source/python/classes/EcFlexpart.py	(revision 4971f63213e5e9edb2e7e207ee071d404b6949f4)
@@ -807,5 +807,5 @@
             over all messages in each grib file which were passed through the
             parameter "inputfiles" to seperate specific parameters into fort.*
-            files. Afterwards the FORTRAN program Convert2 is called to convert
+            files. Afterwards the FORTRAN program is called to convert
             the data fields all to the same grid and put them in one file
             per unique time step (combination of "date", "time" and
@@ -866,5 +866,5 @@
             # per date e.g. time = 0, 1200
             # per time e.g. step = 3, 6, 9, 12
-            # flag for Fortran program CONVERT2 and file merging
+            # flag for Fortran program and file merging
             convertFlag = False
             print('current prod: ', prod)
@@ -884,6 +884,6 @@
                 # Combine all temporary data files into final grib file if
                 # gid is at least one time not None. Therefore set convertFlag
-                # to save information. The fortran program CONVERT2 is also
-                # only done if convertFlag is True
+                # to save information. The Fortran program is also
+                # only executed if convertFlag is True
                 convertFlag = True
                 # remove old fort.* files and open new ones
@@ -997,5 +997,5 @@
                 f.close()
 
-            # call for CONVERT2 if flag is True
+            # call for Fortran program if flag is True
             if convertFlag:
                 pwd = os.getcwd()
@@ -1009,7 +1009,7 @@
 
                 # create the corresponding output file fort.15
-                # (generated by CONVERT2) + fort.16 (paramId 167 and 168)
-                p = subprocess.check_call([os.path.join(c.exedir, 'CONVERT2')],
-                                          shell=True)
+                # (generated by Fortran program) + fort.16 (paramId 167 and 168)
+                p = subprocess.check_call([os.path.join(
+                    c.exedir, _config.FORTRAN_EXECUTABLE)], shell=True)
                 os.chdir(pwd)
 
Index: source/python/install.py
===================================================================
--- source/python/install.py	(revision 25b14bea5de21f28364c210382513c1c9b792d61)
+++ source/python/install.py	(revision 4971f63213e5e9edb2e7e207ee071d404b6949f4)
@@ -78,17 +78,6 @@
     '''
 
-    #os.chdir(_config.PATH_LOCAL_PYTHON)
-
     args = get_install_cmdline_arguments()
-
-    try:
-        c = ControlFile(args.controlfile)
-    except IOError:
-        print('Could not read CONTROL file "' + args.controlfile + '"')
-        print('Either it does not exist or its syntax is wrong.')
-        print('Try "' + sys.argv[0].split('/')[-1] +
-              ' -h" to print usage information')
-        exit(1)
-
+    c = ControlFile(args.controlfile)
     c.assign_args_to_control(args)
     c.check_install_conditions()
Index: source/python/mods/get_mars_data.py
===================================================================
--- source/python/mods/get_mars_data.py	(revision 25b14bea5de21f28364c210382513c1c9b792d61)
+++ source/python/mods/get_mars_data.py	(revision 4971f63213e5e9edb2e7e207ee071d404b6949f4)
@@ -79,13 +79,5 @@
 
     args = get_cmdline_arguments()
-
-    try:
-        c = ControlFile(args.controlfile)
-    except IOError:
-        print('Could not read CONTROL file "' + args.controlfile + '"')
-        print('Either it does not exist or its syntax is wrong.')
-        print('Try "' + sys.argv[0].split('/')[-1] + \
-              ' -h" to print usage information')
-        sys.exit(1)
+    c = ControlFile(args.controlfile)
 
     env_parameter = read_ecenv(_config.PATH_ECMWF_ENV)
Index: source/python/mods/prepare_flexpart.py
===================================================================
--- source/python/mods/prepare_flexpart.py	(revision 25b14bea5de21f28364c210382513c1c9b792d61)
+++ source/python/mods/prepare_flexpart.py	(revision 4971f63213e5e9edb2e7e207ee071d404b6949f4)
@@ -89,13 +89,5 @@
 
     args = get_cmdline_arguments()
-
-    try:
-        c = ControlFile(args.controlfile)
-    except IOError:
-        print('Could not read CONTROL file "' + args.controlfile + '"')
-        print('Either it does not exist or its syntax is wrong.')
-        print('Try "' + sys.argv[0].split('/')[-1] + \
-              ' -h" to print usage information')
-        sys.exit(1)
+    c = ControlFile(args.controlfile)
 
     env_parameter = read_ecenv(_config.PATH_ECMWF_ENV)
Index: source/python/submit.py
===================================================================
--- source/python/submit.py	(revision 25b14bea5de21f28364c210382513c1c9b792d61)
+++ source/python/submit.py	(revision 4971f63213e5e9edb2e7e207ee071d404b6949f4)
@@ -77,13 +77,5 @@
 
     args = get_cmdline_arguments()
-
-    try:
-        c = ControlFile(args.controlfile)
-    except IOError:
-        print('Could not read CONTROL file "' + args.controlfile + '"')
-        print('Either it does not exist or its syntax is wrong.')
-        print('Try "' + sys.argv[0].split('/')[-1] + \
-              ' -h" to print usage information')
-        sys.exit(1)
+    c = ControlFile(args.controlfile)
 
     env_parameter = read_ecenv(_config.PATH_ECMWF_ENV)
@@ -95,5 +87,5 @@
     # on ECMWF server this would also be the local side
     called_from_dir = os.getcwd()
-    if args.queue is None:
+    if not args.queue:
         if c.inputdir[0] != '/':
             c.inputdir = os.path.join(called_from_dir, c.inputdir)
