Removed previous expection so that it doesn't leak information