Adding metrics and fixing a somewhat major NPE (the configuration wouldn't be fully read it if it was encountered)