CLI fixes: NPE in generation and showing error message when no files are...

... present