Another NPE to be avoided
... and check for those NPE