Fix high priority Findbugs issue
Merge pull request #2081 from erwinwinder/master

Fix nullpointer
Merge pull request #2082 from dennishendriksen/master

Fix high priority Findbugs issue
Merge pull request #2083 from erwinwinder/master

Added tags
Prevent nullpointer.
Fix model emx files