Avoiding some more warnings in the error logs.
Authored by: henca 2017-07-21
Parent: [r87]
Child: [r89]
