Fixed curious errors to a couple of exceptions