[Bug Fix, PEEPS-231] More logging