I've made it more robust now and tested it.  I think it's good to land!