Attempt to remove blanket "except:" handling. Probably gonna raise some issues... still better.