Merge pull request #207 from mika-fischer/master

Fix error reporting of activate/deactivate when not sourced but executed