Updated Logger and ErrorHandler