#214 fixing abundant null checks

fixed..
that's a good one :+1: