Fix order display of error message

Change-Id: Iecce2339e73ea151ce5deca303710ffebac5546c