Improve failure handling in kickstart

This should fix PM-801