Added global error handling
Merge branch 'dev' into james_branch_2
Removed the code because it wasn't working
Merge branch 'james_branch_2' into dev