Fixed bug when None value crept into the logs