Fixed the remaining incomplete Exceptions