Fixed error and prop spam
Merge pull request #48 from Jack37/master

Fixed error and prop spam