Adding handling for no-solution