adding message to exception
fixing merge with no target