Proper error handling.
Include 2nd test case.