jdk

8036e9e6 - Null checks should probably be in the beginning...