merge bug (added exception)