Fix for NullPointerException while importing into Eclipse
Merge pull request #905 from hahnjo/dev

Fix for NullPointerException while importing into Eclipse