Update to check for the appropriate exception