next.js

54188831 - Refine the error wording and udpate tests