Fixed: NPEs and verbosity