Fixes several cosmetic bugs (error messages). Adds a mechanism avoiding double injection of properties.