QA-169
avoiding NPE