Fixed admin null-pointer