Fix according to review: getMessage() may return null, use toString() instead