FIX: exit with -1 on Error
Merge remote-tracking branch 'upstream/rel-v6r7' into bug_fix_v6r7
Merge pull request #1461 from graciani/bug_fix_v6r7

Bug fix v6r7