Trying to fix NPE #10
Version 2.1.2