Bug fix to deal with Instantiation Exception