Added initial version of NotEmpty guard