case 1495 - Proper handling of null response from openscan.
Merge branch 'case-1495' into develop
Merge remote-tracking branch 'origin/develop'