bug fixes of null eneities