Fix missing returned value
Handle non-existent pages