Fixed some issues in empty general catch clause.