Fix non-object notices
Merge pull request #141 from ratajczak/master

Fix non-object notices