Handle nil or "" passed as the object_id
Merge pull request #353 from cdearborn/pull-req-master-63dfe3a3c387afc82552207b7258fc5a376b93bc

Merged by devtool for aabes