Yet another tiny little error + improve logging