Bugfixes

Added checks for null Factions