tring to fix NullPointerErrors