SPL: FIT: improve error handling