Added a check so we don't have PHP notices
Merge pull request #158 from iamntz/notice-remover

Added a check so we don't have PHP notices