Fix NPE's

Mistakely made during development of abilities.