Revert change for getMessage() since it caused problems.