#214 fixing abundant null checks

fixed..
rather use a plain if/else here instead of ```switch(..) case 1: ..break; default: // case 2```?