removing assert, adding return false