Added error check and disabled test for now