better error handling in fix-props