Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning