Added ability to handle Objects without throwing error