[PATCH 1/3] Added check text where needed