Fix accidentally left in exception
Fix case of double-specified error and add related tests