#133 check for null