speedup checking panel due to attachments feature
fix var naming
fix for null pointer
Merge pull request #110 from vomikan/master

fix for null pointer