Fixed two possible NPEs from unit tests