Fixing error handling bug outlined in issue 479#480

dodu94 merged 3 commits intoJADE-V-V:developingJADE-V-V/JADE:developingfrom

jude-moo:bugfix/error_handlingjude-moo/JADE:bugfix/error_handlingCopy head branch name to clipboard