v17
Prevent npe. True v17.
Added test for NPE