diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/CodeManager.cs b/src/Daemon/NetDaemon.Daemon/Daemon/CodeManager.cs
index 20c89b256..c6079cfa9 100644
--- a/src/Daemon/NetDaemon.Daemon/Daemon/CodeManager.cs
+++ b/src/Daemon/NetDaemon.Daemon/Daemon/CodeManager.cs
@@ -65,7 +65,8 @@ public IEnumerable<INetDaemonAppBase> InstanceDaemonApps()
                 }
                 catch (Exception e)
                 {
-                    _logger.LogError(e, "Error instance the app from the file {file}", file);
+                    _logger.LogTrace(e, "Error instance the app from the file {file}", file);
+                    _logger.LogError("Error instance the app from the file {file}, use trace flag for details", file);
                     throw new ApplicationException($"Error instance the app from the file {file}", e);
                 }
             }
diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
index bdbd9a5fa..e23f0b119 100644
--- a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
+++ b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
@@ -100,7 +100,6 @@ public class NetDaemonHost : INetDaemonHost, IAsyncDisposable
         private CancellationTokenSource? _cancelTokenSource;
         private IDictionary<string, object> _dataCache = new Dictionary<string, object>();
 
-        private bool _stopped;
 
         /// <summary>
         ///     Constructor
@@ -123,7 +122,7 @@ public class NetDaemonHost : INetDaemonHost, IAsyncDisposable
             _hassClient = hassClient ?? throw new ArgumentNullException("HassClient can't be null!");
             _scheduler = new Scheduler(loggerFactory: loggerFactory);
             _repository = repository;
-            Logger.LogInformation("Instance NetDaemonHost");
+            Logger.LogTrace("Instance NetDaemonHost");
         }
 
         public bool Connected { get; private set; }
@@ -449,7 +448,6 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat
                 await _hassClient.SubscribeToEvents().ConfigureAwait(false);
 
                 Connected = true;
-                _stopped = false;
 
                 Logger.LogInformation(
                     hassioToken != null
@@ -611,7 +609,6 @@ public async Task Stop()
 
                 InternalState.Clear();
 
-                _stopped = true;
 
                 Connected = false;
                 await _hassClient.CloseAsync().ConfigureAwait(false);
diff --git a/src/DaemonRunner/DaemonRunner/Service/API/WsHandler.cs b/src/DaemonRunner/DaemonRunner/Service/API/WsHandler.cs
index c03f038fb..80b78b244 100644
--- a/src/DaemonRunner/DaemonRunner/Service/API/WsHandler.cs
+++ b/src/DaemonRunner/DaemonRunner/Service/API/WsHandler.cs
@@ -179,7 +179,7 @@ public async Task Invoke(HttpContext context)
             }
             catch (Exception e)
             {
-                _logger.LogTrace(e, "Websocket problem found");
+                _logger.LogTrace(e, "Unhandled error in websocket communication");
             }
 
             _sockets.TryRemove(socketId, out _);
@@ -196,7 +196,7 @@ public async Task Invoke(HttpContext context)
 
         public async Task BroadCast(string message, CancellationToken ct = default(CancellationToken))
         {
-            _logger.LogDebug("Broadcasting to {count} clients", _sockets.Count);
+            _logger.LogTrace("Broadcasting to {count} clients", _sockets.Count);
             foreach (var socket in _sockets)
             {
                 if (socket.Value.State != WebSocketState.Open)
diff --git a/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs b/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
index 2793ea6c2..b63e8c587 100644
--- a/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
+++ b/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
@@ -58,7 +58,7 @@ IDaemonAppCompiler daemonAppCompiler
 
         public override async Task StopAsync(CancellationToken cancellationToken)
         {
-            _logger.LogInformation("Stopping NetDaemon...");
+            _logger.LogInformation("Stopping NetDaemon service...");
             await base.StopAsync(cancellationToken).ConfigureAwait(false);
         }
 
@@ -66,24 +66,24 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             try
             {
+                _logger.LogInformation($"Starting NeDaemon service (version {Version})...");
+
                 if (_netDaemonSettings == null)
                 {
-                    _logger.LogError("No config specified, file or environment variables! Exiting...");
+                    _logger.LogError("No configuration specified, in appsettings or environment variables! Exiting...");
                     return;
                 }
 
                 _sourcePath = _netDaemonSettings.GetAppSourceDirectory();
 
-                // EnsureApplicationDirectoryExists(_netDaemonSettings);
-
-
-                _logger.LogDebug("Finding apps in {folder}...", _sourcePath);
+                _logger.LogTrace("Finding apps in {folder}...", _sourcePath);
 
                 // Automatically create source directories
                 if (_sourcePath is string && !Directory.Exists(_sourcePath))
-                    throw new FileNotFoundException("Source path {path} does not exist", _sourcePath);
-
-
+                {
+                    _logger.LogError("Path to app source does not exist {path}, exiting...", _sourcePath);
+                    return;
+                }
 
                 _loadedDaemonApps = null;
 
@@ -101,7 +101,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 _logger.LogError(e, "NetDaemon had unhandled exception, closing...");
             }
 
-            _logger.LogInformation("NetDaemon exited!");
+            _logger.LogInformation("NetDaemon service exited!");
         }
 
         private async Task Run(NetDaemonHost daemonHost, CancellationToken stoppingToken)
@@ -115,7 +115,7 @@ private async Task Run(NetDaemonHost daemonHost, CancellationToken stoppingToken
                         // This is due to re-connect, it must be a re-connect
                         // so delay before retry connect again
                         await Task.Delay(ReconnectInterval, stoppingToken).ConfigureAwait(false); // Wait x seconds
-                        _logger.LogInformation($"Restarting NeDaemon (version {Version})...");
+                        _logger.LogInformation($"Restarting NeDaemon service (version {Version})...");
                     }
 
                     var daemonHostTask = daemonHost.Run(
@@ -146,7 +146,7 @@ private async Task Run(NetDaemonHost daemonHost, CancellationToken stoppingToken
 
                                 if (_loadedDaemonApps is null || !_loadedDaemonApps.Any())
                                 {
-                                    _logger.LogError("No apps found, exiting...");
+                                    _logger.LogError("No NetDaemon apps could be found, exiting...");
                                     return;
                                 }
 
@@ -159,7 +159,7 @@ private async Task Run(NetDaemonHost daemonHost, CancellationToken stoppingToken
                             }
                             catch (TaskCanceledException)
                             {
-                                _logger.LogInformation("Canceling NetDaemon service...");
+                                _logger.LogTrace("Canceling NetDaemon service...");
                             }
                             catch (Exception e)
                             {
@@ -181,7 +181,8 @@ private async Task Run(NetDaemonHost daemonHost, CancellationToken stoppingToken
                 }
                 catch (Exception e)
                 {
-                    _logger.LogError(e, "MAJOR ERROR!");
+                    _logger.LogError("Error in NetDaemon service!, set trace log level to see details.");
+                    _logger.LogTrace(e, "Error in NetDaemon service!");
                 }
                 finally
                 {
@@ -209,7 +210,7 @@ private async Task GenerateEntities(NetDaemonHost daemonHost, string sourceFolde
             if (_entitiesGenerated)
                 return;
 
-            _logger.LogDebug("Generating entities ..");
+            _logger.LogTrace("Generating entities from Home Assistant instance ..");
 
             _entitiesGenerated = true;
             var codeGen = new CodeGenerator();