Added better access error handling