Merge pull request #328 from Dmitry-Me/firstCheckThenConvert

First check, then convert