Added raise exception back to preserve behavior