No more aborting on exception for the daemon, and tidied up som error handling