improved logging

See AGPUSH-624