See if we need this exception or not