Added additional error/info logging