Added error checking in Definition