Merge pull request #2 from tripodsan/master

Fixes for 404 property handling