null pointer

an exception remains
repair conditions
Merge branch 'feature-fixTests' into develop