Merge pull request #105 from adam-vessey/7.x-fix-strict-warning

Fix a strict warning... Need to pass a variable to array_pop().
Fix another warning.

Was assuming that something was always returned, resulting in a
strict warning...