Removing throw statement