Merge pull request #153 from gm4tr1x/missingcheck