npe fix
better to not break someone