Catching possible exception + reduce queries number + removed unneeded default argument