Fixes issue 441: handling NullPointerException by @Nullable