Avoid NPE if result ist null
Suppress exception here
Add content node for label and option tags
Merge branch 'develop' of github.com:structr/structr into develop