Fix Null/Nothing spotted by Tomas