added FIXME comment for correct exception type
merged conflict