fixed:
-Exception introduced with the last commit