Fix a minor coding error checking whether an object is empty, also
coding indentation fixes.
Signed-off-by: Ben McIlwain <bmcilwain@ngpvan.com>