Small fixes (avoid null pointer exception), correct obstacle detection impl.

Signed-off-by: Dieter Niklaus <dieter.niklaus@gmx.net>
Merge remote-tracking branch 'remotes/origin/Branch_1.1.1' into Branch_1.1.3