Adjust stilla orbit
Improve some error conditions