Fix #203

Added check for class/property