Adding back in exception