Added null or whitespace namespace checks back in.