Fully removed Logger, and fixed error handling