FIX: Added more logging [bugs #843, #897]
Authored by: obelix30 2016-11-07
Parent: [r753]
Child: [r755]