fix for the NPE

Signed-off-by: daniel@efficio.us.com <daniel@efficio.us.com>