Fix for NPE (#49)

Fix for #49. This disables the action when it shouldn't be executed
Idem and on the following files as well