Removed try catch block and replaced with a null check for property class
Merge pull request #57 from zachbadgett/mapper-update

Removed try catch block and replaced with a null check for property class