Invalid return value for toolbar
Merge pull request #3 from Krumelur/master

Invalid return values and NullAlloweds