preventing error
Merge pull request #7 from willtp87/7.x

preventing error