Change to throws general Exception