Feature/zen 11926

Unless the docs explicitly say a method will never return null you should check it, or be in a try/catch that's going to handle an NPE.