More validation in activities
Merge pull request #22 from koxon/master

More validation in activities