Cradle: removed pretty output; added null checks