NotEmpty error fixed