Fix for handling properties that don't have a context associated with them.