Strengthening the judgement
Merge pull request #2396 from VisualSJ/develop-rc

Strengthening the judgement(Reader)