Bubble up the proper error message & improve the test