New log messages
Added some checks