Added a condition to prevent php notices
Merge pull request #161 from iamntz/develop

Added a condition to prevent php notices