Finish error handling for top part of FDA