Check error conditions more carefully for TRN-487a.