Make a few more methods null safe