Shouldn't crash with nothing anymore. Fixed #9