Removed try catch in favor of (expected = HantoException.class)
Fixed merge conflicts