cleanup silliness null check