Case 3196 - Changed error logging for entities.
Case 3196 - Logging errors to watchdog.
Merge branch 'case-3196' into develop

* case-3196:
  Case 3196 - Logging errors to watchdog.
  Case 3196 - Changed error logging for entities.