Fix

1. Polish the error message