#214 fixing abundant null checks

fixed..