remove incorrect exception throwing