Prevent NPE
Cosmetic: javadoc
Fixes usage of given action instead of always use "MESSAGE"
Fixes #8