Minor cleanup for IntelliJ. Removing extra exception in favour of null check