if exception getMessage() is null, don't add it to the error

Consolidate the error message construction, allowing the
exception getMessage() to fail.