undo changes to handle exception edge case.  Seems like Travis has a broken PhantomJS setup that's causing unit tests to fail.