privat/nit — pull request #330 by privat (2014-03-12 15:02:16+00:00)
Title: fixes for nitmetrics

Remove some crashes in borderline usages