Minor logging improvement
Improved logs and made them nil safe