fixed the possible reason for the big stacktrace in the logs
Merge remote-tracking branch 'etorreborre/master'