4th Commit

No null exceptions.