Check if it's not NONE too
Check if it's not NONE too

So that we don't have to check it again in somewhere else,
and we don't really need to know if it's presented as NONE

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7345/diffs#note_20123999

dreampet/gitlab,dplarson/gitlabhq,openwide-java/gitlabhq,t-zuehlsdorff/gitlabhq,openwide-java/gitlabhq,dreampet/gitlab,t-zuehlsdorff/gitlabhq,axilleas/gitlabhq,mmkassem/gitlabhq,LUMC/gitlabhq,jirutka/gitlabhq,t-zuehlsdorff/gitlabhq,iiet/iiet-git,darkrasid/gitlabhq,darkrasid/gitlabhq,mmkassem/gitlabhq,jirutka/gitlabhq,iiet/iiet-git,htve/GitlabForChinese,stoplightio/gitlabhq,dplarson/gitlabhq,openwide-java/gitlabhq,axilleas/gitlabhq,jirutka/gitlabhq,openwide-java/gitlabhq,stoplightio/gitlabhq,LUMC/gitlabhq,t-zuehlsdorff/gitlabhq,stoplightio/gitlabhq,dplarson/gitlabhq,iiet/iiet-git,mmkassem/gitlabhq,htve/GitlabForChinese,dreampet/gitlab,axilleas/gitlabhq,iiet/iiet-git,htve/GitlabForChinese,axilleas/gitlabhq,jirutka/gitlabhq,dreampet/gitlab,stoplightio/gitlabhq,LUMC/gitlabhq,LUMC/gitlabhq,dplarson/gitlabhq,darkrasid/gitlabhq,htve/GitlabForChinese,darkrasid/gitlabhq,mmkassem/gitlabhq