Added some extra error checks and throwing errors to try and catch
any bugs that are stopping us enabling this globally