Added post: Exception-handling improvements