Exception handling improvement
No more System.arraycopy()