Fixed issue about a pesky null pointer